Skip to content

Commit

Permalink
removing all explicit repo references and stopping publishing on test…
Browse files Browse the repository at this point in the history
….pypi.org #15941
  • Loading branch information
behrisch committed Dec 19, 2024
1 parent dbe2576 commit 7270572
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 41 deletions.
1 change: 0 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ env:

jobs:
build-and-push-image:
if: github.repository == 'eclipse-sumo/sumo'
runs-on: ubuntu-latest
permissions:
contents: read
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
# building the documentation
############################
build-and-internal-link-check:
if: github.repository == 'eclipse-sumo/sumo'
runs-on: ubuntu-latest

steps:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/jupedsim-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ on:

jobs:
build:
if: github.repository == 'DLR-TS/sumo' || github.event_name == 'pull_request'
runs-on: windows-latest
strategy:
# Allow all other matrix-jobs to continue running, even if one of the jobs fails
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/linux-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ jobs:
python3 -m build -o ../wheelhouse
- name: Building SUMO / libsumo Python wheels (latest manylinux docker)
# if: github.repository == 'DLR-TS/sumo'
uses: docker://quay.io/pypa/manylinux2014_x86_64
with:
entrypoint: tools/build_config/build_wheels.sh

# the next two steps are only needed when we debug the manylinux build
# - name: Building Python wheels (fixed manylinux docker)
# if: github.repository == 'eclipse-sumo/sumo'
# uses: docker://quay.io/pypa/manylinux2014_x86_64:2022-11-14-1226cfc
# with:
# entrypoint: tools/build_config/build_wheels.sh
Expand Down Expand Up @@ -98,7 +96,6 @@ jobs:
testenv/bin/python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
- name: Running "sumo in the wheel" tests
if: github.repository == 'DLR-TS/sumo'
run: |
source testenv/bin/activate
python3 -m pip install -r tools/req_ci.txt -r tools/requirements.txt
Expand Down Expand Up @@ -133,7 +130,7 @@ jobs:
# publishing wheels
###################
publish-wheels:
if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
needs: [test-wheels]
runs-on: ubuntu-latest
permissions:
Expand All @@ -143,13 +140,6 @@ jobs:
- name: Downloading Wheels artifact
uses: actions/download-artifact@v4

- name: Publish to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: manylinux-wheels/
repository-url: https://test.pypi.org/legacy/
skip-existing: true

- name: Publish to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
pipx install texttest
- name: Validate CITATION.cff
if: matrix.build_type == 'full' && github.repository == 'DLR-TS/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
uses: dieghernan/cff-validator@v3
with:
install-r: true
Expand Down Expand Up @@ -88,11 +88,11 @@ jobs:
make traas
- name: Setting up SonarQube
if: matrix.build_type == 'full' && github.repository == 'eclipse-sumo/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
uses: warchant/setup-sonar-scanner@v8

- name: Building SUMO with SonarQube wrapper
if: matrix.build_type == 'full' && github.repository == 'eclipse-sumo/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
run: |
cd sumo/cmake-build
curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
Expand All @@ -102,14 +102,13 @@ jobs:
sonar-scanner -Dsonar.token=${{ secrets.SONAR_TOKEN }} -Dsonar.cfamily.compile-commands=cmake-build/bw-output/compile_commands.json
- name: Building and Installing SUMO
if: matrix.build_type != 'full' || github.repository != 'eclipse-sumo/sumo' || github.event_name != 'schedule' || matrix.compiler != 'gcc'
run: |
cd sumo/cmake-build
make -j4
sudo make install
- name: Building Examples and Tests
if: matrix.build_type == 'full' && (github.repository == 'DLR-TS/sumo' || matrix.compiler == 'gcc')
if: matrix.build_type == 'full'
# need to explicitly uninstall matplotlib below because pandas pulls it in but we need a newer version for test stability
# having both installed confuses matplotlib https://github.com/matplotlib/matplotlib/issues/26827
# the pipdeptree below is also just for debugging but often comes handy so keep it enabled
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/macos-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ jobs:
python3 -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
- name: Running "sumo in the wheel" tests
if: github.repository == 'DLR-TS/sumo'
run: |
if [[ "${{ matrix.python_version }}" != "3.12" ]]; then python3 -m pip install -r tools/requirements.txt; fi
tests/runTests.sh -b ci -v ci.fast -a activitygen,duarouter,jtrrouter,marouter,od2trips,polyconvert
Expand Down Expand Up @@ -173,7 +172,7 @@ jobs:
# publishing wheels
###################
publish-wheels:
if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
needs: [test-wheels]
runs-on: ubuntu-latest
permissions:
Expand All @@ -185,13 +184,6 @@ jobs:
path: python-wheels
merge-multiple: true

- name: Publish to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: python-wheels/
repository-url: https://test.pypi.org/legacy/
skip-existing: true

- name: Publish to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/wheel-cibw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ jobs:
python3 -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
- name: Running "sumo in the wheel" tests
if: github.repository == 'DLR-TS/sumo'
run: |
if [[ "${{ matrix.python_version }}" != "3.12" ]]; then python3 -m pip install -r tools/requirements.txt; fi
tests/runTests.sh -b ci -v ci.fast -a activitygen,duarouter,jtrrouter,marouter,od2trips,polyconvert
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/windows-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ jobs:
python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $env:GITHUB_ENV
- name: Running "sumo in the wheel" tests
if: github.repository == 'DLR-TS/sumo'
run: |
python -m pip install -r tools/req_ci.txt -r tools/requirements.txt
$env:TEXTTEST_CI_APPS = "-v ci.fast -a activitygen,dfrouter,duarouter,jtrrouter,marouter,netgen,od2trips,polyconvert,netconvert,sumo"
Expand All @@ -169,7 +168,6 @@ jobs:
# tests\runCiTests.bat $env:pythonLocation\Scripts\texttestc.py

- name: Running "sumo in the wheel" meta tests
if: github.repository != 'DLR-TS/sumo'
run: |
$env:TEXTTEST_CI_APPS = "-ts meta"
tests\runCiTests.bat $env:pythonLocation\Scripts\texttestc.py
Expand Down Expand Up @@ -199,7 +197,7 @@ jobs:
# publishing wheels
###################
publish-wheels:
if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
needs: [test-wheels]
runs-on: ubuntu-latest
permissions:
Expand All @@ -216,12 +214,6 @@ jobs:
mv ./*-wheels/* dist
rm -f dist/sumolib* dist/traci*
- name: Publish to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
repository-url: https://test.pypi.org/legacy/
skip-existing: true

- name: Publish to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
ctest -R texttest --verbose
- name: Examples and extra tests
if: matrix.build_type == 'extra' && github.repository == 'DLR-TS/sumo'
if: matrix.build_type == 'extra'
run: |
python -m pip install -r sumo/tools/req_ci.txt -r sumo/tools/requirements.txt
cd sumo/build_msvc
Expand All @@ -112,14 +112,14 @@ jobs:
ctest --build-config Release --verbose
- name: Compressing test results
if: failure() && github.repository == 'DLR-TS/sumo'
if: failure()
run: |
dir d:\texttest
Compress-Archive -Path D:/texttest -DestinationPath D:/texttest/tt.zip
dir d:\texttest
- name: Uploading test results
if: failure() && github.repository == 'DLR-TS/sumo'
if: failure()
uses: actions/upload-artifact@v4
with:
name: texttesttmp-${{ matrix.build_type }}
Expand Down

0 comments on commit 7270572

Please sign in to comment.