summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2023-04-14 14:49:48 -0600
committerMats Wichmann <mats@linux.com>2023-04-14 14:55:21 -0600
commit05864ca5926e54446753788be5cf7e77f6db08c0 (patch)
treece1c0fea624353d8f39c9f7764967ae7781315c5
parentc80cbb0846c5d9265f356e86c4e79f1d13e3e8a8 (diff)
downloadscons-git-05864ca5926e54446753788be5cf7e77f6db08c0.tar.gz
Drop coverage from CI, don't add mingw
Experiment: coverage build broke because "codecov" package removed from PyPI on 12 Apr 2023. We'll need to re-craft a coverage build, for now just don't set COVERAGE true for any appveyor build (leaving the framework in place to copy to the new setup). Experiment: the setup of mingw for the github action for experimental features on Windows is failing for unknown reason ("error code 1"), possibly sourceforge failure, possibly something else. But - we shouldn't need to install mingw into an environment that is already provisioned with mingw. Try that. Apparently it's technically a syntax error for setup.cfg lines (that are not continuation lines) to be indented - had one tool gripe about this, which was made happy by dedenting one line. Including that in this PR, just because... Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--.appveyor.yml2
-rw-r--r--.github/workflows/experimental_tests.yml14
-rw-r--r--setup.cfg2
3 files changed, 10 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index a8db5e9f9..f7e23f60f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,6 +30,7 @@ install:
# Leaving the Coverage build on VS2017 for build-time reasons (1hr time limit).
# maybe move coverage to github in future to restore some flexibility?
environment:
+ # set COVERAGE to 1 for any builder that should run it
COVERAGE: 0
SCONS_CACHE_MSVC_CONFIG: "true"
matrix:
@@ -42,7 +43,6 @@ environment:
- WINPYTHON: "Python38"
- WINPYTHON: "Python36"
- COVERAGE: 1
# remove sets of build jobs based on criteria below
# to fine tune the number and platforms tested
diff --git a/.github/workflows/experimental_tests.yml b/.github/workflows/experimental_tests.yml
index 8717b1448..0ff03a39a 100644
--- a/.github/workflows/experimental_tests.yml
+++ b/.github/workflows/experimental_tests.yml
@@ -23,7 +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-2019', 'macos-latest']
+ os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
@@ -33,11 +34,12 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- - name: Set up MinGW
- uses: egor-tensin/setup-mingw@v2
- if: matrix.os == 'windows-2019'
- with:
- platform: x64
+ # 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
- name: Set up Python 3.11 ${{ matrix.os }}
uses: actions/setup-python@v2
diff --git a/setup.cfg b/setup.cfg
index f177d6f11..67a0385f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,7 +75,7 @@ SCons.Tool.docbook = *.*
sconsign.1
[sdist]
- dist_dir=build/dist
+dist_dir=build/dist
[bdist_wheel]
; We're now py3 only