Merge pull request #9179

e499e74 actions: update to v4 actions (tobtoht)
This commit is contained in:
luigi1111 2024-03-07 21:34:13 -05:00
commit c3ebfb132f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 19 additions and 19 deletions

View file

@ -31,10 +31,10 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: /Users/runner/Library/Caches/ccache path: /Users/runner/Library/Caches/ccache
key: ccache-${{ runner.os }}-build-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ github.sha }}
@ -57,10 +57,10 @@ jobs:
run: run:
shell: msys2 {0} shell: msys2 {0}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: C:\Users\runneradmin\.ccache path: C:\Users\runneradmin\.ccache
key: ccache-${{ runner.os }}-build-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ github.sha }}
@ -90,10 +90,10 @@ jobs:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-20.04] os: [ubuntu-22.04, ubuntu-20.04]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-build-${{ matrix.os }}-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ matrix.os }}-${{ github.sha }}
@ -116,10 +116,10 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-libwallet-${{ github.sha }} key: ccache-${{ runner.os }}-libwallet-${{ github.sha }}
@ -144,11 +144,11 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: ccache - name: ccache
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-build-ubuntu-latest-${{ github.sha }} key: ccache-${{ runner.os }}-build-ubuntu-latest-${{ github.sha }}
@ -178,7 +178,7 @@ jobs:
source-archive: source-archive:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: recursive submodules: recursive
@ -189,7 +189,7 @@ jobs:
export OUTPUT="$VERSION.tar" export OUTPUT="$VERSION.tar"
echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
/home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT" /home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: ${{ env.OUTPUT }} name: ${{ env.OUTPUT }}
path: /home/runner/work/monero/monero/${{ env.OUTPUT }} path: /home/runner/work/monero/monero/${{ env.OUTPUT }}

View file

@ -7,7 +7,7 @@ jobs:
createPullRequest: createPullRequest:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Make changes to pull request - name: Make changes to pull request
continue-on-error: true continue-on-error: true
shell: bash shell: bash

View file

@ -64,20 +64,20 @@ jobs:
packages: "gperf cmake python3" packages: "gperf cmake python3"
name: ${{ matrix.toolchain.name }} name: ${{ matrix.toolchain.name }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: recursive submodules: recursive
# Most volatile cache # Most volatile cache
- name: ccache - name: ccache
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ matrix.toolchain.host }}-${{ github.sha }} key: ccache-${{ matrix.toolchain.host }}-${{ github.sha }}
restore-keys: ccache-${{ matrix.toolchain.host }}- restore-keys: ccache-${{ matrix.toolchain.host }}-
# Less volatile cache # Less volatile cache
- name: depends cache - name: depends cache
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: contrib/depends/built path: contrib/depends/built
key: depends-${{ matrix.toolchain.host }}-${{ hashFiles('contrib/depends/packages/*') }} key: depends-${{ matrix.toolchain.host }}-${{ hashFiles('contrib/depends/packages/*') }}
@ -86,7 +86,7 @@ jobs:
depends-${{ matrix.toolchain.host }}- depends-${{ matrix.toolchain.host }}-
# Static cache # Static cache
- name: OSX SDK cache - name: OSX SDK cache
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: contrib/depends/sdk-sources path: contrib/depends/sdk-sources
key: sdk-${{ matrix.toolchain.host }}-${{ matrix.toolchain.osx_sdk }} key: sdk-${{ matrix.toolchain.host }}-${{ matrix.toolchain.osx_sdk }}
@ -104,7 +104,7 @@ jobs:
run: | run: |
${{env.CCACHE_SETTINGS}} ${{env.CCACHE_SETTINGS}}
make depends target=${{ matrix.toolchain.host }} -j2 make depends target=${{ matrix.toolchain.host }} -j2
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'x86_64-apple-darwin' || matrix.toolchain.host == 'x86_64-unknown-linux-gnu' }} if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'x86_64-apple-darwin' || matrix.toolchain.host == 'x86_64-unknown-linux-gnu' }}
with: with:
name: ${{ matrix.toolchain.name }} name: ${{ matrix.toolchain.name }}

View file

@ -42,7 +42,7 @@ jobs:
echo \`\`\` >> $GITHUB_STEP_SUMMARY echo \`\`\` >> $GITHUB_STEP_SUMMARY
shasum -a256 * >> $GITHUB_STEP_SUMMARY shasum -a256 * >> $GITHUB_STEP_SUMMARY
echo \`\`\` >> $GITHUB_STEP_SUMMARY echo \`\`\` >> $GITHUB_STEP_SUMMARY
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: ${{ matrix.operating-system.name }} name: ${{ matrix.operating-system.name }}
path: | path: |