Merge pull request #8745

eaf5902 workflows: update dependencies to fix warnings (selsta)
This commit is contained in:
luigi1111 2023-03-18 18:19:25 -04:00
commit b7dbf4fd7c
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 21 additions and 19 deletions

View File

@ -30,10 +30,10 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v2 - uses: actions/cache@v3
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 }}
@ -54,15 +54,15 @@ jobs:
run: run:
shell: msys2 {0} shell: msys2 {0}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v2 - uses: actions/cache@v3
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 }}
restore-keys: ccache-${{ runner.os }}-build- restore-keys: ccache-${{ runner.os }}-build-
- uses: eine/setup-msys2@v2 - uses: msys2/setup-msys2@v2
with: with:
update: true update: true
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git
@ -82,10 +82,10 @@ jobs:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-20.04] os: [ubuntu-22.04, ubuntu-20.04]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v2 - uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-build-${{ matrix.os }}-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ matrix.os }}-${{ github.sha }}
@ -108,10 +108,10 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- uses: actions/cache@v2 - uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-libwallet-${{ github.sha }} key: ccache-${{ runner.os }}-libwallet-${{ github.sha }}
@ -136,11 +136,11 @@ jobs:
env: env:
CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_TEMPDIR: /tmp/.ccache-temp
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: ccache - name: ccache
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ runner.os }}-build-ubuntu-latest-${{ github.sha }} key: ccache-${{ runner.os }}-build-ubuntu-latest-${{ github.sha }}
@ -170,8 +170,9 @@ jobs:
source-archive: source-archive:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
fetch-depth: 0
submodules: recursive submodules: recursive
- name: archive - name: archive
run: | run: |
@ -180,7 +181,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@v2 - uses: actions/upload-artifact@v3
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

@ -63,19 +63,20 @@ jobs:
packages: "gperf cmake python3" packages: "gperf cmake python3"
name: ${{ matrix.toolchain.name }} name: ${{ matrix.toolchain.name }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v3
with: with:
fetch-depth: 0
submodules: recursive submodules: recursive
# Most volatile cache # Most volatile cache
- name: ccache - name: ccache
uses: actions/cache@v2 uses: actions/cache@v3
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@v2 uses: actions/cache@v3
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/*') }}
@ -84,7 +85,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@v2 uses: actions/cache@v3
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 }}
@ -102,7 +103,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@v2 - uses: actions/upload-artifact@v3
if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'x86_64-apple-darwin11' || matrix.toolchain.host == 'x86_64-unknown-linux-gnu' }} if: ${{ matrix.toolchain.host == 'x86_64-w64-mingw32' || matrix.toolchain.host == 'x86_64-apple-darwin11' || 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.1.0 - uses: actions/upload-artifact@v3
with: with:
name: ${{ matrix.operating-system.name }} name: ${{ matrix.operating-system.name }}
path: | path: |