gh action ng

valord577 · Aug 23, 2024 · acf445f · acf445f
1 parent 9af4104
commit acf445f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml
@@ -38,8 +38,7 @@ jobs:
       - name: clone with gh
         run: |
           gh repo clone ${{ github.repositoryUrl }} . -- --no-checkout --single-branch --depth=1
-          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}
-          git checkout FETCH_HEAD
+          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}; git checkout FETCH_HEAD
       - name: set matrix
         id: set-matrix
         run: |
@@ -73,12 +72,10 @@ jobs:
       - name: clone with gh
         run: |
           gh repo clone ${{ github.repositoryUrl }} . -- --no-checkout --single-branch --depth=1
-          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}
-          git checkout FETCH_HEAD
+          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}; git checkout FETCH_HEAD
       - name: install required software(s)
         run: |
-          brew list -l
-          brew install ccache nasm
+          brew list -l; brew install ccache nasm
       - name: gh action ccache restore
         uses: actions/cache/restore@v4
         with:
@@ -118,8 +115,7 @@ jobs:
       - name: clone with gh
         run: |
           gh repo clone ${{ github.repositoryUrl }} . -- --no-checkout --single-branch --depth=1
-          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}
-          git checkout FETCH_HEAD
+          git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}; git checkout FETCH_HEAD
       - name: download ${{ github.workflow }} libraries
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -1,5 +1,11 @@
 name: ffmpeg
 on:
+  workflow_dispatch:
+    inputs:
+      disable_shared:
+        default: true
+        required: false
+        type: boolean
   push:
     branches:
       - main
@@ -30,4 +36,5 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/_matrix.yml
     with:
+      disable_shared: ${{ inputs.disable_shared }}
       disable_upload: true
diff --git a/deps/ffmpeg b/deps/ffmpeg
diff --git a/scripts/mbedtls.sh b/scripts/mbedtls.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -e
 
 # ----------------------------
 # init submodules