Skip to content

Commit 737e1f4

Browse files
github-actions[bot]dependabot[bot]CoolSpy3
authored
Merge master into develop (#6656)
* Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows (#6652) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact to v4 (#6654) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: CoolSpy3 <[email protected]>
1 parent c35ccd6 commit 737e1f4

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/test_suite_linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ jobs:
7474
sudo python -m pip install requests PyGithub
7575
pip install pyopenssl --upgrade
7676
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
77-
- uses: actions/upload-artifact@v3
77+
- uses: actions/upload-artifact@v4
7878
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
7979
with:
8080
name: build-${{ matrix.os }}
8181
path: |
8282
distribution/*.tar.bz2
8383
distribution/*.zip
84-
- uses: actions/upload-artifact@v3
84+
- uses: actions/upload-artifact@v4
8585
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test ros') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
8686
with:
8787
name: build-${{ matrix.os }}
@@ -121,7 +121,7 @@ jobs:
121121
export TESTS_HOME=$PWD # required by cache group in the test suite
122122
export BRANCH_HASH=$(git log -1 --format='%H')
123123
xvfb-run --auto-servernum python tests/test_suite.py
124-
- uses: actions/upload-artifact@v3
124+
- uses: actions/upload-artifact@v4
125125
if: failure()
126126
with:
127127
name: test-results-${{ matrix.os }}

.github/workflows/test_suite_linux_develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ jobs:
7070
sudo python -m pip install requests PyGithub
7171
pip install pyopenssl --upgrade
7272
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
73-
- uses: actions/upload-artifact@v3
73+
- uses: actions/upload-artifact@v4
7474
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
7575
with:
7676
name: build-${{ matrix.os }}
7777
path: |
7878
distribution/*.tar.bz2
7979
distribution/*.zip
80-
- uses: actions/upload-artifact@v3
80+
- uses: actions/upload-artifact@v4
8181
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test ros') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
8282
with:
8383
name: build-${{ matrix.os }}

.github/workflows/test_suite_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: |
6060
sudo python -m pip install requests PyGithub
6161
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
62-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
6363
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test distribution') }}
6464
with:
6565
name: build-${{ matrix.os }}

.github/workflows/test_suite_mac_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: |
5656
sudo python -m pip install requests PyGithub
5757
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
58-
- uses: actions/upload-artifact@v3
58+
- uses: actions/upload-artifact@v4
5959
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test distribution') }}
6060
with:
6161
name: build-${{ matrix.os }}

.github/workflows/test_suite_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
python -m pip install requests PyGithub
8989
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
90-
- uses: actions/upload-artifact@v3
90+
- uses: actions/upload-artifact@v4
9191
if: ${{ contains(github.event.pull_request.labels.*.name, 'test distribution') }}
9292
with:
9393
name: build-${{ matrix.os }}

.github/workflows/test_suite_windows_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
python -m pip install requests PyGithub
8585
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
86-
- uses: actions/upload-artifact@v3
86+
- uses: actions/upload-artifact@v4
8787
if: ${{ contains(github.event.pull_request.labels.*.name, 'test distribution') }}
8888
with:
8989
name: build-${{ matrix.os }}

0 commit comments

Comments
 (0)