summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2023-04-21 09:51:48 -0700
committerGitHub <noreply@github.com>2023-04-21 09:51:48 -0700
commit0ef81fc03600cd275a8e6733aeca26e0db268dad (patch)
treed5cc55d1f3e1b4502bbf7caacae9161774d8f8c0
parente5b10a0152aca79b96d231f07c7a7f5672fb09e9 (diff)
parent991bf6744dbe73ce49e8d3ce3c2a6400517b89df (diff)
downloadscons-git-0ef81fc03600cd275a8e6733aeca26e0db268dad.tar.gz
Merge pull request #4339 from mwichmann/maint/ci-tweaks
Drop coverage from CI for now
-rw-r--r--.appveyor.yml2
-rw-r--r--.github/workflows/experimental_tests.yml3
-rw-r--r--setup.cfg2
3 files changed, 5 insertions, 2 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..c272d51e8 100644
--- a/.github/workflows/experimental_tests.yml
+++ b/.github/workflows/experimental_tests.yml
@@ -23,6 +23,7 @@ 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-latest', 'macos-latest']
os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
# The type of runner that the job will run on
@@ -33,6 +34,8 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
+ # 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'
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