Ensuring sha256 generating for missing packages (#209)

redis-stack · Sep 15, 2022 · 0c3fb4f · 0c3fb4f
1 parent 6d8053d
commit 0c3fb4f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/APPIMAGE_REUSABLE.yml b/.github/workflows/APPIMAGE_REUSABLE.yml
@@ -107,7 +107,7 @@ jobs:
           ./pkg2appimage.AppImage `pwd`/etc/redis-stack-server.appimage
           mv out/redis-stack-server-*.AppImage out/${{matrix.package}}-${{steps.get_version.outputs.VERSION}}-${{inputs.arch}}.AppImage
           for i in `ls out/*.AppImage`; do
-            sha256 $i | awk '{print $1}' > $i.sha256
+            sha256sum $i | awk '{print $1}' > $i.sha256
           done
 
 #      - name: validate packages

diff --git a/.github/workflows/SNAP_REUSABLE.yml b/.github/workflows/SNAP_REUSABLE.yml
@@ -84,7 +84,7 @@ jobs:
           source .venv/bin/activate
           invoke package -o ${{inputs.osname}} -s ${{inputs.osnick}} -d ${{inputs.platform}} -a ${{inputs.arch}} -t ${{env.target}} -p ${{ matrix.package }}
           for i in `ls *.snap`; do
-            sha256 $i | awk '{print $1}' > $i.sha256
+            sha256sum $i | awk '{print $1}' > $i.sha256
           done
 
 #      - name: validate packages

diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
@@ -411,11 +411,6 @@ jobs:
        cd redis-stack
        source .venv/bin/activate
        invoke package -o ${{env.osname}} -s ${{env.osnick}} -d ${{env.platform}} -a ${{env.arch}} -r ../redis/src -t zip -p redis-stack-server -k fetch
-       for i in `ls *.zip`; do
-         sha256sum $i |awk '{print $1}' > $i.sha256
-       done
-       mkdir s3dist
-       cp *.zip *.sha256 s3dist
 
    - name: perist the zipfile
      uses: actions/upload-artifact@v2
@@ -470,7 +465,7 @@ jobs:
      uses: actions/checkout@v2
    - name: install dependencies
      run: |
-       brew install libomp openssl
+       brew install libomp openssl coreutils
        poetry install
    - name: gather artifacts
      uses: actions/download-artifact@v2
@@ -515,8 +510,12 @@ jobs:
    - name: persist redis to s3
      if: steps.iamafork.outputs.IAMAFORK == 'false'
      run: |
-       s3cmd put -P redis-stack/redis-stack-server*.${{env.target}} \
-       s3://redismodules/redis-stack/snapshots/redis-stack-server-${{steps.get_version.outputs.VERSION}}.${{env.osnick}}.${{env.arch}}.${{env.target}}
+      mkdir s3dist
+      cp redis-stack/redis-stack*.${{env.target}} s3dist
+      for i in `ls s3dist`; do
+        sha256sum $i | awk '{print $1'} > s3dist/$i.sha256
+      done
+      s3cmd put -P s3dist/* s3://redismodules/redis-stack/snapshots/
 
  # the m1 requires a zip file so that homebrew can unpack it
  build-package-osx-m1:
@@ -543,6 +542,9 @@ jobs:
      uses: actions/setup-python@v3
      with:
        python-version: "${{ env.pythonversion }}"
+   - name: install dependencies
+     run: |
+      brew install coreutils
    - name: install poetry
      uses: snok/install-poetry@v1
      with:
@@ -647,7 +649,7 @@ jobs:
        s3cmd put -P *.sha256 s3://redismodules/redis-stack/snapshots/
 
  test-osx-m1:
-   name: M1 tests
+   name: Mac (M1) tests
    needs: [build-package-osx-m1]
    env:
      arch: arm64
@@ -663,7 +665,7 @@ jobs:
      - name: determine if in fork
        id: iamafork
        run: |
-         amfork=`cat /Users/runner/work/_temp/_github_workflow/event.json | jq '.pull_request.head.repo.fork'`
+         amfork=`cat /github/workflow/event.json | jq '.pull_request.head.repo.fork'`
          echo "am I fork: ${amfork}"
          echo "::set-output name=IAMAFORK::$amfork"