TS-0 Fix release action

cqse · Dec 3, 2024 · ae2b326 · ae2b326
1 parent 9bf86b5
commit ae2b326
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/build-graalvm.yml b/.github/workflows/build-graalvm.yml
@@ -93,19 +93,24 @@ jobs:
       - build-windows-graalvm
     name: Create Release
     runs-on: ubuntu-latest
+    env:
+      DISTRIBUTIONS_DIR: ./teamscale-upload-dists
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
+        with:
+          path: ./distributions
       - name: Package
         run: |
-          (cd ./target-linux && zip ../teamscale-upload-linux.zip ./teamscale-upload)
-          (cd ./target-mac && zip ../teamscale-upload-mac.zip ./teamscale-upload)
-          (cd ./target-windows && zip ../teamscale-upload-windows.zip ./teamscale-upload.exe)
+          (cd $DISTRIBUTIONS_DIR && zip ./teamscale-upload-linux.zip teamscale-upload)
+          (cd $DISTRIBUTIONS_DIR && zip ./teamscale-upload-mac.zip ./teamscale-upload)
+          (cd $DISTRIBUTIONS_DIR && zip ./teamscale-upload-windows.zip ./teamscale-upload.exe)
+          (ls -1 $DISTRIBUTIONS_DIR)
       - name: Upload Release Assets
         id: create_release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}
-          file: teamscale-upload-*.zip
+          file: $DISTRIBUTIONS_DIR/teamscale-upload-*.zip
           file_glob: true
           overwrite: true
diff --git a/.github/workflows/build-jlink.yml b/.github/workflows/build-jlink.yml
@@ -61,23 +61,27 @@ jobs:
       - build-jlink
     name: Create Release (jlink)
     runs-on: ubuntu-latest
+    env:
+      DISTRIBUTIONS_DIR: ./teamscale-upload-dists
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        with:
+          path: ./distributions
       - name: List downloaded distributions
         run: ls -1 target-jlink
       - name: Rename Distributions
         run: |
-          (mv ./target-jlink/teamscale-upload-linux-x86_64.zip ./target-jlink/teamscale-upload-jlink-linux-x86_64.zip)
-          (mv ./target-jlink/teamscale-upload-windows-x86_64.zip ./target-jlink/teamscale-upload-jlink-windows-x86_64.zip)
-          (mv ./target-jlink/teamscale-upload-macos-x86_64.zip ./target-jlink/teamscale-upload-jlink-macos-x86_64.zip)
-          (mv ./target-jlink/teamscale-upload-macos-aarch64.zip ./target-jlink/teamscale-upload-jlink-macos-aarch64.zip)
-          (ls -1 target-jlink)
+          (cd $DISTRIBUTIONS_DIR && mv teamscale-upload-linux-x86_64.zip teamscale-upload-jlink-linux-x86_64.zip)
+          (cd $DISTRIBUTIONS_DIR && mv teamscale-upload-windows-x86_64.zip teamscale-upload-jlink-windows-x86_64.zip)
+          (cd $DISTRIBUTIONS_DIR && mv teamscale-upload-macos-x86_64.zip teamscale-upload-jlink-macos-x86_64.zip)
+          (cd $DISTRIBUTIONS_DIR && mv teamscale-upload-macos-aarch64.zip teamscale-upload-jlink-macos-aarch64.zip)
+          (ls -1 $DISTRIBUTIONS_DIR)
       - name: Upload Release Assets
         id: create_release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}
-          file: target-jlink/teamscale-upload-jlink-*.zip
+          file: $DISTRIBUTIONS_DIR/teamscale-upload-jlink-*.zip
           file_glob: true
           overwrite: true