summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2023-04-15 09:08:55 -0600
committerMats Wichmann <mats@linux.com>2023-04-15 09:08:55 -0600
commit991bf6744dbe73ce49e8d3ce3c2a6400517b89df (patch)
tree1db945e40df54fb5f61906ffd019ec759e037917
parent05864ca5926e54446753788be5cf7e77f6db08c0 (diff)
downloadscons-git-991bf6744dbe73ce49e8d3ce3c2a6400517b89df.tar.gz
Put back the setup-mingw [skip appveyor]
The test ran through the two mingw tests in the experimental ninja tests, but hung up later - apparently on test/ninja\ninja_command_line.py. Try putting the install step back in. Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--.github/workflows/experimental_tests.yml17
1 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/experimental_tests.yml b/.github/workflows/experimental_tests.yml
index 0ff03a39a..c272d51e8 100644
--- a/.github/workflows/experimental_tests.yml
+++ b/.github/workflows/experimental_tests.yml
@@ -23,8 +23,8 @@ jobs:
matrix:
# note: in the 2nd half of 2022 the setup-mingw was often failing on
# windows-latest. revisit someday (perhaps when there's an @v3)
- #os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
- os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+ #os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+ os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
@@ -34,12 +34,13 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- # experiment: looks like we don't need this if we use windows-latest
- #- name: Set up MinGW
- # uses: egor-tensin/setup-mingw@v2
- # if: matrix.os == 'windows-2019'
- # with:
- # platform: x64
+ # experiment: maybe don't need this?
+ # update: looks like we do: with this commented out, the build hung
+ - name: Set up MinGW
+ uses: egor-tensin/setup-mingw@v2
+ if: matrix.os == 'windows-2019'
+ with:
+ platform: x64
- name: Set up Python 3.11 ${{ matrix.os }}
uses: actions/setup-python@v2