Skip to content

Commit 7089faa

Browse files
committed
Merge branch 'master' into release/2.0
2 parents 32757b5 + b17e5b2 commit 7089faa

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/compiler-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
config:
20-
- {name: x86_64-macos, os: macos-latest, cmakeArgs: -DENABLE_X86SIMD=OFF, buildType: Release}
20+
- {name: x86_64-macos, os: macos-12, cmakeArgs: -DENABLE_X86SIMD=OFF, buildType: Release}
2121
- {name: x86_64-linux, os: ubuntu-latest, cmakeArgs: '', buildType: Release}
2222
- {name: x86_64-windows, os: windows-latest, arch: x64, cmakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl, buildType: Release}
2323

@@ -79,7 +79,7 @@ jobs:
7979
matrix:
8080
dotnet-version: ['7.0']
8181
config:
82-
- {name: x86_64-macos, os: macos-latest, shell: bash, rid: osx-x64, buildType: Release}
82+
- {name: x86_64-macos, os: macos-12, shell: bash, rid: osx-x64, buildType: Release}
8383
- {name: x86_64-linux, os: ubuntu-latest, shell: bash, rid: linux-x64, buildType: Release}
8484
- {name: x86_64-windows, os: windows-latest, shell: bash, rid: win-x64, buildType: Release}
8585

@@ -168,7 +168,7 @@ jobs:
168168
matrix:
169169
dotnet-version: ['7.0']
170170
config:
171-
- {name: x86_64-macos, os: macos-latest, shell: bash}
171+
- {name: x86_64-macos, os: macos-12, shell: bash}
172172
- {name: x86_64-linux, os: ubuntu-latest, shell: bash}
173173
- {name: x86_64-windows, os: windows-latest, shell: bash}
174174

@@ -245,7 +245,7 @@ jobs:
245245
cache-dependency-path: '**/requirements.test.txt'
246246

247247
- name: Install Python Packages
248-
run:
248+
run:
249249
python -m pip install --upgrade pip
250250
pip install -r requirements.test.txt
251251

.github/workflows/compiler-python-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
dotnet-version: ['7.0']
1616
config:
17-
- {name: x86_64-macos, os: macos-latest, shell: bash, rid: osx-x64, buildType: Release}
17+
- {name: x86_64-macos, os: macos-12, shell: bash, rid: osx-x64, buildType: Release}
1818
- {name: x86_64-linux, os: ubuntu-latest, shell: bash, rid: linux-x64, buildType: Release}
1919
- {name: x86_64-windows, os: windows-latest, shell: bash, rid: win-x64, buildType: Release}
2020

@@ -53,7 +53,7 @@ jobs:
5353
matrix:
5454
dotnet-version: ['7.0']
5555
config:
56-
- {name: x86_64-macos, os: macos-latest}
56+
- {name: x86_64-macos, os: macos-12}
5757
- {name: x86_64-linux, os: ubuntu-latest}
5858
- {name: x86_64-windows, os: windows-latest, arch: x64}
5959

.github/workflows/jupyter-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
config:
13-
- {name: x86_64-macos, os: macos-latest}
13+
- {name: x86_64-macos, os: macos-12}
1414
- {name: x86_64-linux, os: ubuntu-latest}
1515
- {name: x86_64-windows, os: windows-latest}
1616

.github/workflows/runtime-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
config:
16-
- { name: x86_64-macos, os: macos-latest, cmakeArgs: '', buildType: Release }
16+
- { name: x86_64-macos, os: macos-12, cmakeArgs: '', buildType: Release }
1717
- { name: x86_64-linux, os: ubuntu-latest, cmakeArgs: '', buildType: Release }
1818
- { name: x86_64-windows, os: windows-latest, arch: x64, cmakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl, buildType: Release }
1919

@@ -109,7 +109,7 @@ jobs:
109109
wget https://dav.sunnycase.moe/d/ci/nncase/${{matrix.config.toolchain_file}}.tar.xz -O toolchain.tar.xz
110110
sudo tar xf toolchain.tar.xz -C $GITHUB_WORKSPACE
111111
echo "${{matrix.config.toolchain_env}}=$GITHUB_WORKSPACE/${{matrix.config.toolchain_file}}" >> $GITHUB_ENV
112-
112+
113113
wget https://dav.sunnycase.moe/d/ci/nncase/${{matrix.config.qemu}}.tgz -O qemu.tgz
114114
sudo tar xf qemu.tgz -C /usr/local/bin
115115
echo "TESTS_EXECUTABLE_LOADER=${{matrix.config.qemu}}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)