more ci fixes

opendlang · Oct 22, 2024 · 5fece24 · 5fece24
1 parent 6f4debc
commit 5fece24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/actions/7-package/action.yml b/.github/actions/7-package/action.yml
@@ -110,20 +110,6 @@ runs:
         echo "ARTIFACT_ID=$artifactID" >> $GITHUB_ENV
         echo "ARTIFACT_NAME=$os-${{ inputs.arch }}" >> $GITHUB_ENV
 
-    - name: 'Linux: Pack source dir'
-      if: runner.os == 'Linux' && inputs.os == ''
-      shell: bash
-      run: |
-        set -eux
-        git clean -dffx
-        cd ..
-        artifactName="opend-$ARTIFACT_ID-src"
-        chmod -R go=rX opend/ldc
-        GZIP=-9 tar -czf artifacts/$artifactName.tar.gz --exclude-vcs --owner=0 --group=0 --transform="s,^opend/ldc,$artifactName," opend/ldc
-        # unpack & create zip
-        tar -xf artifacts/$artifactName.tar.gz
-        zip -r -9 artifacts/$artifactName.zip $artifactName >/dev/null
-
     - name: 'Move artifacts dir for uploading'
       shell: bash
       run: mv ../artifacts ./

diff --git a/.github/actions/upload-to-github/action.yml b/.github/actions/upload-to-github/action.yml
@@ -52,7 +52,8 @@ runs:
         fi
 
         ls -lh
-        sha256sum * > "opend-$ARTIFACT_ID.sha256sums.txt"
+        # $ARTIFACT_ID
+        sha256sum * > "opend-latest.sha256sums.txt"
 
     - name: Upload to GitHub release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -229,6 +229,7 @@ jobs:
     needs:
       - build-native
       - build-cross
+      - merge-macos
     permissions:
       contents: write
     steps: