Release build (#24)

* Try this release stuff. * Add everything else to the release party. * Archim platformio build too. * Get rid of globs. * Try another name. * Create the release zip ourselves. * Minor nit. * Big jump in version.
jeffeb3 · Jul 30, 2020 · c265338 · c265338
1 parent 00a5ff7
commit c265338
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 16 deletions.
diff --git a/.github/workflows/archim.yml b/.github/workflows/archim.yml
@@ -15,6 +15,9 @@ on:
     - src/configs/V1*Ramps*
     - src/configs/V1*Skr*
     - '**/*.md'
+  release:
+    types:
+      - created
 
 jobs:
   build-platform-io:
@@ -79,13 +82,24 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
 
   build-arduino:
 
@@ -135,7 +149,7 @@ jobs:
       run: |
         src/core/config-for-machine ${{ matrix.machine }}
 
-    - name: Build
+    - name: Build Arduino
       uses: ArminJo/arduino-test-compile@v2
       with:
         sketch-names: Marlin.ino
@@ -151,10 +165,22 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
+
diff --git a/.github/workflows/rambo.yml b/.github/workflows/rambo.yml
@@ -15,6 +15,9 @@ on:
     - src/configs/V1*Ramps*
     - src/configs/V1*Skr*
     - '**/*.md'
+  release:
+    types:
+      - created
 
 jobs:
   build:
@@ -39,7 +42,6 @@ jobs:
         - V1CNC_Rambo
         - V1CNC_Rambo_Dual
         - V1CNC_Rambo_DualLR
-        - V1CNC_Ramps_Dual
         - V1ZXY_MiniRambo
 
     steps:
@@ -96,10 +98,21 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
diff --git a/.github/workflows/ramps.yml b/.github/workflows/ramps.yml
@@ -15,6 +15,9 @@ on:
     - src/configs/V1*Skr*
     - src/configs/V1*Rambo*
     - '**/*.md'
+  release:
+    types:
+      - created
 
 jobs:
   build:
@@ -36,6 +39,7 @@ jobs:
         machine:
         - V13DP_Ramps_MK8
         - V1ZXY_Ramps
+        - V1CNC_Ramps_Dual
 
     steps:
 
@@ -88,10 +92,21 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
diff --git a/.github/workflows/skr1p3.yml b/.github/workflows/skr1p3.yml
@@ -16,6 +16,9 @@ on:
     - src/configs/V1*Ramps*
     - src/configs/V1*SkrPro*
     - '**/*.md'
+  release:
+    types:
+      - created
 
 jobs:
   build:
@@ -83,10 +86,21 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
diff --git a/.github/workflows/skrpro.yml b/.github/workflows/skrpro.yml
@@ -16,6 +16,9 @@ on:
     - src/configs/V1*Ramps*
     - src/configs/V1*Skr1p3*
     - '**/*.md'
+  release:
+    types:
+      - created
 
 jobs:
   build:
@@ -80,10 +83,21 @@ jobs:
       run: |
         src/core/zip-marlin
 
-    - name: Upload
+    - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.machine }}-${{ matrix.branch }}
         path: |
           firmware_*
-          Marlin*.zip
+          Marlin_*.zip
+
+    - name: Upload Marlin-${{ matrix.machine }}-${{ matrix.branch }}-src.zip to release
+      if: ${{ github.event_name == 'release' }}
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: Marlin-Release.zip
+        asset_name: ${{ matrix.machine }}-${{ matrix.branch }}-src.zip
+        asset_content_type: application/zip
diff --git a/src/core/version b/src/core/version
@@ -2,7 +2,7 @@
 
 # Set up the custom version strings here.
 
-export V1_VERSION=430
+export V1_VERSION=500
 export MARLIN_VERSION="${MARLIN_VERSION:-Custom}"
 export CONFIG_NAME="${CONFIG_NAME:-ConfigUnknown}"
 

diff --git a/src/core/zip-marlin b/src/core/zip-marlin
@@ -41,4 +41,5 @@ zip -prq "Marlin_${CONFIG_NAME}_${MARLIN_VERSION}_${V1_VERSION}"-src.zip "$short
 # It's ok if these fail
 mv firmware.bin "firmware_${CONFIG_NAME}_${MARLIN_VERSION}_${V1_VERSION}.bin" || echo "No bin file found"
 mv firmware.hex "firmware_${CONFIG_NAME}_${MARLIN_VERSION}_${V1_VERSION}.hex" || echo "No hex file found"
-mv Marlin.ino.bin "firmware_${CONFIG_NAME}_${MARLIN_VERSION}_${V1_VERSION}.bin" || echo "No Marlin bin file found"
+
+zip -prq Marlin-Release.zip "Marlin_${CONFIG_NAME}_${MARLIN_VERSION}_${V1_VERSION}"-src.zip firmware_*