Github Action cleaning

SRWieZ · Sep 7, 2024 · 9ca3145 · 9ca3145
1 parent ee3aab8
commit 9ca3145
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 27 deletions.
diff --git a/.github/workflows/build-linux-arm-binary.yml b/.github/workflows/build-linux-arm-binary.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: build/
-          key: build-deps-php-${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}
+          key: build-deps-php${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}-${{ runner.arch }}
 
       - name: Get composer cache directory
         id: composer-cache
@@ -56,13 +56,13 @@ jobs:
 
       - if: ${{ github.event_name == 'workflow_dispatch' }}
         name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_NAME }}
           path: build/bin/${{ env.BINARY_NAME }}
 
       - if: ${{ github.event_name != 'workflow_dispatch' }}
         name: Upload binaries to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/bin/${{ env.BINARY_NAME }}
diff --git a/.github/workflows/build-linux-binary.yml b/.github/workflows/build-linux-binary.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: build/
-          key: build-deps-php-${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}
+          key: build-deps-php${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}-${{ runner.arch }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -56,13 +56,13 @@ jobs:
 
       - if: ${{ github.event_name == 'workflow_dispatch' }}
         name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_NAME }}
           path: build/bin/${{ env.BINARY_NAME }}
 
       - if: ${{ github.event_name != 'workflow_dispatch' }}
         name: Upload binaries to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/bin/${{ env.BINARY_NAME }}
diff --git a/.github/workflows/build-macos-arm-binary.yml b/.github/workflows/build-macos-arm-binary.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: build/
-          key: build-deps-php-${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}
+          key: build-deps-php${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}-${{ runner.arch }}
 
       - name: Get composer cache directory
         id: composer-cache
@@ -56,32 +56,18 @@ jobs:
       - name: Composer install
         run: composer install --prefer-dist --no-progress --optimize-autoloader
 
-#      - id: cache-download
-#        name: Cached source download
-#        uses: actions/cache@v3
-#        with:
-#          path: downloads
-#          key: php-${{ env.COMPILE_PHP_VERSION }}-dependencies
-#
-#      - if: steps.cache-download.outputs.cache-hit != 'true'
-#        name: Fetch php and extensions sources
-#        run: ./bin/spc download --with-php=${{ env.COMPILE_PHP_VERSION }} --for-extensions=$COMPILE_EXTENSIONS
-#
-#      - name: Build Micro
-#        run: ./bin/spc build $COMPILE_EXTENSIONS --build-micro
-
       - name: Build Binary
         run: ./build.sh --name "${{ env.BINARY_NAME }}"
 
       - if: ${{ github.event_name == 'workflow_dispatch' }}
         name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_NAME }}
           path: build/bin/${{ env.BINARY_NAME }}
 
       - if: ${{ github.event_name != 'workflow_dispatch' }}
         name: Upload binaries to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/bin/${{ env.BINARY_NAME }}
diff --git a/.github/workflows/build-macos-binary.yml b/.github/workflows/build-macos-binary.yml
@@ -42,7 +42,7 @@ jobs:
 #        uses: actions/cache@v3
 #        with:
 #          path: build/
-#          key: build-deps-php-${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}
+#          key: build-deps-php${{ env.COMPILE_PHP_VERSION }}-${{ runner.os }}-${{ runner.arch }}
 
       - name: Get composer cache directory
         id: composer-cache
@@ -63,13 +63,13 @@ jobs:
 
       - if: ${{ github.event_name == 'workflow_dispatch' }}
         name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_NAME }}
           path: build/bin/${{ env.BINARY_NAME }}
 
       - if: ${{ github.event_name != 'workflow_dispatch' }}
         name: Upload binaries to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/bin/${{ env.BINARY_NAME }}
diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
@@ -41,6 +41,6 @@ jobs:
         run: composer box compile
 
       - name: Upload phar to release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/bin/svgtinyps.phar