diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 84b312a4..313f42ea 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -28,7 +28,7 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 - name: Run shellcheck run: find . \( -name "*.tool" -o -name "*.command" -o -name "*.sh" \) -exec sh -c 'for TargetFile; do shellcheck --severity=info "${TargetFile}" || exit 1; done' sh {} + @@ -115,14 +115,14 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 - run: ./build_oc.tool --skip-build --skip-package - name: Run Coverity working-directory: UDK run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/coverity/covstrap-linux.sh) && eval "$src" || exit 1 env: COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} COVERITY_SCAN_EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12db0d68..cda04bdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ env: jobs: build-macos: name: macOS XCODE5 - runs-on: macos-latest + runs-on: macos-13 env: JOB_TYPE: BUILD steps: @@ -40,7 +40,7 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 - run: ./build_duet.tool - run: ./build_oc.tool @@ -164,7 +164,7 @@ jobs: - name: CI Bootstrap run: | - src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 - run: ./build_duet.tool - run: ./build_oc.tool diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml index d05ea466..01879c5b 100644 --- a/.github/workflows/uncrustify.yml +++ b/.github/workflows/uncrustify.yml @@ -25,7 +25,7 @@ jobs: - name: CI Bootstrap run: | - src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 + src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1 - name: Run Uncrustify run: | diff --git a/build_duet.tool b/build_duet.tool index 64099e9f..7cc1eafc 100755 --- a/build_duet.tool +++ b/build_duet.tool @@ -192,5 +192,5 @@ else export SELFPKG export NO_ARCHIVES - src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/efibuild.sh) && eval "$src" || exit 1 + src=$(curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/efibuild.sh) && eval "$src" || exit 1 fi diff --git a/build_oc.tool b/build_oc.tool index 22a7efa0..3584982d 100755 --- a/build_oc.tool +++ b/build_oc.tool @@ -382,7 +382,7 @@ export SELFPKG export NO_ARCHIVES export DISCARD_PACKAGES -src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/efibuild.sh) && eval "$src" || exit 1 +src=$(curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/efibuild.sh) && eval "$src" || exit 1 cd Utilities/ocvalidate || exit 1 ocv_tool="" diff --git a/docker-compose.yaml b/docker-compose.yaml index acde154b..a6cb8b70 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -30,14 +30,14 @@ services: entrypoint: - /bin/bash - -c - - "{ . ~/.edk2_rc.sh && eval \"$$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh)\" && ./build_oc.tool ; } || exit 1" + - "{ . ~/.edk2_rc.sh && eval \"$$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh)\" && ./build_oc.tool ; } || exit 1" build-duet: extends: service: dev-edk2 entrypoint: - /bin/bash - -c - - "{ . ~/.edk2_rc.sh && eval \"$$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh)\" && ./build_duet.tool ; } || exit 1" + - "{ . ~/.edk2_rc.sh && eval \"$$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh)\" && ./build_duet.tool ; } || exit 1" build-docs: extends: service: dev-docs