diff options
| -rw-r--r-- | .github/workflows/build-toolchains.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/continuous-integration-workflow.yml | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/build-toolchains.yml b/.github/workflows/build-toolchains.yml index acf93962..46792980 100644 --- a/.github/workflows/build-toolchains.yml +++ b/.github/workflows/build-toolchains.yml @@ -18,25 +18,25 @@ jobs: runs-on: ${{ matrix.host }} strategy: matrix: - host: [ "ubuntu-latest", "macos-latest" ] + host: ["ubuntu-22.04", "macos-latest"] sample: ${{ fromJSON(inputs.samples) }} exclude: # Exclude both glibc & uClibc ARC Linux toolchains as # there's no known use of ARC Linux toolchains on Mac, # and anyway glibc fails to build for ARC700, # see https://github.com/crosstool-ng/crosstool-ng/pull/1456#issuecomment-779150246 - - { host: "macos-latest", sample: "arc-multilib-linux-gnu" } - - { host: "macos-latest", sample: "arc-multilib-linux-uclibc" } + - {host: "macos-latest", sample: "arc-multilib-linux-gnu"} + - {host: "macos-latest", sample: "arc-multilib-linux-uclibc"} # Exclude mips*-*-linux-gnu because of <byteswap.h> usage in # elf-entry.c for linux kernel headers. <byteswap.h> is a GNU # extension and doesn't exist on MacOS X - - { host: "macos-latest", sample: "mips-unknown-linux-gnu" } - - { host: "macos-latest", sample: "mips64-unknown-linux-gnu" } + - {host: "macos-latest", sample: "mips-unknown-linux-gnu"} + - {host: "macos-latest", sample: "mips64-unknown-linux-gnu"} # Exclude x86_64-w64-mingw32,x86_64-pc-linux-gnu because it crashes on m4 build with # a Segmentation fault - - { host: "macos-latest", sample: "x86_64-w64-mingw32,x86_64-pc-linux-gnu" } + - {host: "macos-latest", sample: "x86_64-w64-mingw32,x86_64-pc-linux-gnu"} steps: - name: create case sensitive workspace volume for macOS if: ${{ runner.os == 'macOS' }} diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 2d6634ed..c5696f5f 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.host }} strategy: matrix: - host: [ "ubuntu-latest", "macos-latest" ] + host: ["ubuntu-22.04", "macos-latest"] steps: - name: "clone" uses: actions/checkout@v3 @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.host }} strategy: matrix: - host: [ "ubuntu-latest" ] + host: ["ubuntu-22.04"] steps: - name: "download ct-ng" uses: actions/download-artifact@v3 @@ -89,7 +89,7 @@ jobs: path: src.tar toolchains: - needs: [ crosstool, tarballs ] + needs: [crosstool, tarballs] uses: ./.github/workflows/build-toolchains.yml with: samples: >- @@ -122,7 +122,7 @@ jobs: ] canadian-cross: - needs: [ toolchains ] + needs: [toolchains] uses: ./.github/workflows/build-toolchains.yml with: samples: >- |