Merge branch 'v3-chrishamm' into 3.5-dev

Duet3D · Jun 11, 2024 · 5cac091 · 5cac091
2 parents 7cb1a68 + 90bb0dc
commit 5cac091
Show file tree

Hide file tree

Showing 3 changed files with 159 additions and 28 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,17 +1,8 @@
-name: Build and and deploy firmware
+name: Build and and deploy firmware to dev
 
 on:
   workflow_dispatch:
     inputs:
-      target:
-        description: "Deployment target"
-        required: true
-        default: "dev"
-        type: choice
-        options:
-        - dev
-        - unstable-3.5
-        - stable-3.5
       version:
         description: "Version"
         required: true
@@ -49,13 +40,6 @@ jobs:
           ref: "3.5-dev"
           path: "./Duet3Expansion"
 
-      - name: "Check out DuetWiFiSocketServer"
-        uses: actions/checkout@v3
-        with:
-          repository: "Duet3D/DuetWiFiSocketServer"
-          ref: "dev"
-          path: "./DuetWiFiSocketServer"
-
       - name: "Check out FreeRTOS"
         uses: actions/checkout@v3
         with:
@@ -84,6 +68,13 @@ jobs:
           ref: "3.5-dev"
           path: "./RRFLibraries"
 
+      - name: "Check out WiFiSocketServerRTOS"
+        uses: actions/checkout@v3
+        with:
+          repository: "Duet3D/WiFiSocketServerRTOS"
+          ref: "main"
+          path: "./WiFiSocketServerRTOS"
+
       - name: "Prepare CrcAppender"
         env:
           GH_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -0,0 +1,76 @@
+name: Upload stable release assets
+
+on:
+  release:
+    types: [prereleased]
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      # Download release assets
+      - name: Download assets
+        run: |
+          mkdir assets
+          cd assets
+          gh release download -R Duet3D/RepRapFirmware $GITHUB_REF_NAME -p "*.bin" -p "*.uf2"
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+      # Clean up unused files
+      - name: Remove unused files
+        run: |
+          cd assets
+          rm -f Duet2CombinedFirmware.bin DuetMaestroFirmware.bin Duet*_SD*.bin Duet3_CAN*.bin DuetWiFi*.bin
+
+      # Upload assets to unstable feed on pkg.duet3d.com
+      - name: Upload files to unstable package feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable
+
+      # Upload assets to unstable-3.4 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.4')
+        name: Upload files to unstable 3.4 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable-3.4
+
+      # Upload assets to unstable-3.5 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.5')
+        name: Upload files to unstable 3.5 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable-3.5
+
+      # Upload assets to unstable-3.6 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.6')
+        name: Upload files to unstable 3.5 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable-3.6
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,8 +1,8 @@
-name: Upload release assets
+name: Upload stable release assets
 
 on:
   release:
-    types: [published]
+    types: [released]
 
 jobs:
   build:
@@ -23,8 +23,8 @@ jobs:
           cd assets
           rm -f Duet2CombinedFirmware.bin DuetMaestroFirmware.bin Duet*_SD*.bin Duet3_CAN*.bin DuetWiFi*.bin
 
-      # Upload assets to (un)stable feed on pkg.duet3d.com
-      - name: Upload files to primary feed
+      # Upload assets to stable feed on pkg.duet3d.com
+      - name: Upload files to stable package feed
         uses: Creepios/[email protected]
         with:
           host: pkg.duet3d.com
@@ -33,11 +33,62 @@ jobs:
           password: ${{ secrets.PKG_SSH_PASS }}
           privateKey: ${{ secrets.PKG_SSH_KEY }}
           localPath: ./assets
-          remotePath: /var/rrf-pkg/${{ (github.event.release.prerelease && 'unstable') || 'stable' }}
+          remotePath: /var/rrf-pkg/stable
 
-      # Upload assets to (un)stable-3.4 feed on pkg.duet3d.com
+      # Upload assets to unstable feed on pkg.duet3d.com
+      - name: Upload files to unstable package feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable
+
+      # Upload assets to stable-3.4 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.4')
+        name: Upload files to stable 3.4 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/stable-3.4
+
+      # Upload assets to unstable-3.4 feed on pkg.duet3d.com
       - if: contains(github.ref, '3.4')
-        name: Upload files to 3.4 feed
+        name: Upload files to unstable 3.4 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/unstable-3.4
+
+      # Upload assets to stable-3.5 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.5')
+        name: Upload files to stable 3.5 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/stable-3.5
+
+      # Upload assets to unstable-3.5 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.5')
+        name: Upload files to unstable 3.5 feed
         uses: Creepios/[email protected]
         with:
           host: pkg.duet3d.com
@@ -46,11 +97,24 @@ jobs:
           password: ${{ secrets.PKG_SSH_PASS }}
           privateKey: ${{ secrets.PKG_SSH_KEY }}
           localPath: ./assets
-          remotePath: /var/rrf-pkg/${{ (github.event.release.prerelease && 'unstable') || 'stable' }}-3.4
+          remotePath: /var/rrf-pkg/unstable-3.5
 
-      # Upload assets to (un)stable-3.5 feed on pkg.duet3d.com
+      # Upload assets to stable-3.6 feed on pkg.duet3d.com
       - if: contains(github.ref, '3.5')
-        name: Upload files to 3.5 feed
+        name: Upload files to stable 3.6 feed
+        uses: Creepios/[email protected]
+        with:
+          host: pkg.duet3d.com
+          port: 22
+          username: ${{ secrets.PKG_SSH_USER }}
+          password: ${{ secrets.PKG_SSH_PASS }}
+          privateKey: ${{ secrets.PKG_SSH_KEY }}
+          localPath: ./assets
+          remotePath: /var/rrf-pkg/stable-3.6
+
+      # Upload assets to unstable-3.6 feed on pkg.duet3d.com
+      - if: contains(github.ref, '3.6')
+        name: Upload files to unstable 3.5 feed
         uses: Creepios/[email protected]
         with:
           host: pkg.duet3d.com
@@ -59,5 +123,5 @@ jobs:
           password: ${{ secrets.PKG_SSH_PASS }}
           privateKey: ${{ secrets.PKG_SSH_KEY }}
           localPath: ./assets
-          remotePath: /var/rrf-pkg/${{ (github.event.release.prerelease && 'unstable') || 'stable' }}-3.5
+          remotePath: /var/rrf-pkg/unstable-3.6