Update main_matrix.yml

* Guard the assets

* Indicated legacy build-all

* Hopefully fixed

.github/workflows/main_matrix.yml

@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - "**.md"
       - "**.yml"
+      - "version.properties"
 
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
@@ -403,17 +404,46 @@ jobs:
           artifacts-dir: pr
           artifacts: ./firmware-${{ steps.version.outputs.version }}.zip
 
-      - name: Verify version.properties change
-        uses: tj-actions/verify-changed-files@v10.1
-        id: verify-changed-files
+  release-artifacts:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [gather-artifacts, after-checks]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+          
+      - name: Setup Python
+        uses: actions/setup-python@v2
         with:
-          files: |
-             version.properties
+          python-version: 3.x
+
+      - name: Get release version string
+        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        id: version
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: firmware-${{ steps.version.outputs.version }}
+          path: ./output
+
+      - name: Zip firmware
+        run: zip -j -r ./firmware-${{ steps.version.outputs.version }}.zip ./output
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: debug-elfs-${{ steps.version.outputs.version }}.zip
+          path: ./elfs
+      
+      - name: Zip Elfs
+        run: zip -j -r ./debug-elfs-${{ steps.version.outputs.version }}.zip ./elfs
+
+      # For diagnostics
+      - name: Show artifacts
+        run: ls -lR
 
       - name: Create release
         uses: actions/create-release@v1
         id: create_release
-        if: contains(steps.verify-changed-files.outputs.changed_files, 'version.properties') && ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         with:
           draft: true
           prerelease: true
@@ -426,7 +456,6 @@ jobs:
 
       - name: Add bins to release
         uses: actions/upload-release-asset@v1
-        if: contains(steps.verify-changed-files.outputs.changed_files, 'version.properties') && ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
@@ -435,17 +464,8 @@ jobs:
           asset_name: firmware-${{ steps.version.outputs.version }}.zip
           asset_content_type: application/zip
 
-      - uses: actions/download-artifact@v2
-        with:
-          name: debug-elfs-${{ steps.version.outputs.version }}.zip
-          path: ./elfs
-      
-      - name: Zip Elfs
-        run: zip -j -r ./debug-elfs-${{ steps.version.outputs.version }}.zip ./elfs
-
       - name: Add debug elfs to release
         uses: actions/upload-release-asset@v1
-        if: contains(steps.verify-changed-files.outputs.changed_files, 'version.properties') && ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
@@ -453,3 +473,18 @@ jobs:
           asset_path: ./debug-elfs-${{ steps.version.outputs.version }}.zip
           asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
           asset_content_type: application/zip
+
+      - name: Bump version.properties
+        run: >-
+          bin/bump_version.py
+          
+      - name: Commit updated version.properties
+        id: commit_updated
+        run: |
+          git config --global user.name 'thebentern'
+          git config --global user.email 'benmmeadors@gmail.com'
+          git remote set-url origin https://x-access-token:${{ secrets.ARTIFACTS_TOKEN }}@github.com/${{ github.repository }}
+          git add version.properties
+          git commit -m "Bump version" && git push -f || echo "No changes to commit"
+          git log -n 1 --pretty=format:"%H" | tail -n 1 | awk '{print "::set-output name=sha::"$0}'
+

bin/bump_version.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+"""Bump the version number"""
+
+lines = None
+
+with open('version.properties', 'r', encoding='utf-8') as f:
+    lines = f.readlines()
+
+with open('version.properties', 'w', encoding='utf-8') as f:
+    for line in lines:
+        if line.lstrip().startswith("build = "):
+            words = line.split(" = ")
+            ver = f'build = {int(words[1]) + 1}'
+            f.write(f'{ver}\n')
+        else:
+            f.write(line)

src/configuration.h

@@ -81,7 +81,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define DISABLE_NTP
 
 // Disable the welcome screen and allow 
-#define DISABLE_WELCOME_UNSET
+//#define DISABLE_WELCOME_UNSET
 
 // -----------------------------------------------------------------------------
 // OLED & Input