From ce63f58cf1eea4519782766e92b02413c6a84d48 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Wed, 24 Apr 2024 10:52:45 -0700 Subject: [PATCH 1/4] Upgrade setup-python and checkout actions in CI This will hopefully get setup-python to install Python for the correct architecture now that the macos runners have switched to ARM. --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6881a98aad..7ced7ffa467 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,10 @@ jobs: # Keep this in sync with clang-format-diff.sh LLVM_VERSION: 17 steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install tools @@ -48,10 +48,10 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true @@ -116,10 +116,10 @@ jobs: name: clang (LTO) runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install ninja @@ -147,10 +147,10 @@ jobs: CC: "clang-18" CXX: "clang++-18" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install clang 18 @@ -178,10 +178,10 @@ jobs: name: alpine runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: start docker @@ -218,10 +218,10 @@ jobs: CC: "clang" CXX: "clang++" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install ninja @@ -247,10 +247,10 @@ jobs: CC: "clang-18" CXX: "clang++-18" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install clang 18 @@ -280,10 +280,10 @@ jobs: # Format: https://github.com//emscripten/tree/ EMSCRIPTEN_REPO: "" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install ninja @@ -313,10 +313,10 @@ jobs: name: mingw runs-on: windows-latest steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: cmake @@ -335,10 +335,10 @@ jobs: CC: "gcc" CXX: "g++" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install ninja @@ -369,10 +369,10 @@ jobs: CC: "gcc" CXX: "g++" steps: - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.x' - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: submodules: true - name: install ninja From 896873977a49df2964346be9e2227cd74956d406 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Wed, 24 Apr 2024 11:04:29 -0700 Subject: [PATCH 2/4] full checkout on lint builder --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ced7ffa467..e25e6897b18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + fetch-depth: 0 - name: install tools run: | sudo pip3 install -r requirements-dev.txt From 604427681953f1d9a2acb711cf6df6cb71364305 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Wed, 24 Apr 2024 12:01:11 -0700 Subject: [PATCH 3/4] add arm64 to CMAKE_OSX_ARCHITECTURES --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e25e6897b18..b9904ee8d9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: if: matrix.os == 'ubuntu-latest' - name: cmake (macos) - run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install -DCMAKE_OSX_ARCHITECTURES=x86_64 + run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 if: matrix.os == 'macos-latest' - name: cmake (win) From 397beb9edde5f3333bcef0f67758812c542341fe Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Wed, 24 Apr 2024 12:20:48 -0700 Subject: [PATCH 4/4] quotes --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9904ee8d9f..ef83170346a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: if: matrix.os == 'ubuntu-latest' - name: cmake (macos) - run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 + run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install '-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64' if: matrix.os == 'macos-latest' - name: cmake (win)