Merge remote-tracking branch 'origin/main'

tmthecoder · Mar 17, 2022 · e9ee247 · e9ee247
2 parents 8b01e96 + 8da9698
commit e9ee247
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/.github/workflows/dargon2_library-builder.yml b/.github/workflows/dargon2_library-builder.yml
@@ -23,10 +23,18 @@ jobs:
         mkdir -p lib/src/blobs/
         cp argon2_library/libargon2.so.1 lib/src/blobs/libargon2-linux.so
     - name: Check if there are changes
-      id: changes
-      uses: UnicornGlobal/[email protected]
+      run: |
+        function check() {
+          if [[ -z "$(git status --porcelain)" ]];
+          then
+            echo "0"
+          else
+            echo "1"
+          fi
+        }
+        echo "CHANGED=$(check)" >> $GITHUB_ENV
     - name: Push if Changed
-      if: steps.changes.outputs.changed == 1
+      if: ${{ env.CHANGED == '1' }}
       run: |
         git config user.name  "Github Actions"
         git config user.email "[email protected]"
@@ -53,10 +61,18 @@ jobs:
         cd ..
         cp argon2_library/libargon2.1.dylib lib/src/blobs/libargon2-darwin.dylib
     - name: Check if there are changes
-      id: changes
-      uses: UnicornGlobal/[email protected]
+      run: |
+        function check() {
+          if [[ -z "$(git status --porcelain)" ]];
+          then
+            echo "0"
+          else
+            echo "1"
+          fi
+        }
+        echo "CHANGED=$(check)" >> $GITHUB_ENV
     - name: Push if Changed
-      if: steps.changes.outputs.changed == 1
+      if: ${{ env.CHANGED == '1' }}
       run: |
         git config user.name  "Github Actions"
         git config user.email "[email protected]"
@@ -85,13 +101,23 @@ jobs:
       - name: Copy Library
         run: Copy-Item “argon2_library\vs2015\build\Argon2OptDll.dll” -Destination “lib\src\blobs\libargon2-win.dll”
       - name: Check if there are changes
-        id: changes
-        uses: UnicornGlobal/[email protected]
+        run: |
+          function check() {
+            if [[ -z "$(git status --porcelain)" ]];
+            then
+              echo "0"
+            else
+              echo "1"
+            fi
+          }
+          echo "CHANGED=$(check)" >> $GITHUB_ENV
+        shell: bash
       - name: Push if Changed
-        if: steps.changes.outputs.changed == 1
+        if: ${{ env.CHANGED == '1' }}
         run: |
           git config user.name  "Github Actions"
           git config user.email "[email protected]"
-          git add -f lib\src\blobs\libargon2-win.dll
+          git add -f lib/src/blobs/libargon2-win.dll
           git commit -m "Create Native Library for Windows"
           git push origin main
+        shell: bash
diff --git a/dargon2/lib/src/blobs/libargon2-darwin.dylib b/dargon2/lib/src/blobs/libargon2-darwin.dylib
diff --git a/dargon2/lib/src/blobs/libargon2-win.dll b/dargon2/lib/src/blobs/libargon2-win.dll