Merge pull request #7855

ce0a2ce CI: use runner.os instead of OS labels (mj-xmr)
This commit is contained in:
luigi1111 2021-09-09 15:16:31 -04:00
commit b13110b7b8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -27,8 +27,8 @@ jobs:
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: /Users/runner/Library/Caches/ccache path: /Users/runner/Library/Caches/ccache
key: ccache-macos-build-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ github.sha }}
restore-keys: ccache-macos-build- restore-keys: ccache-${{ runner.os }}-build-
- name: install dependencies - name: install dependencies
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf ccache run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf ccache
- name: build - name: build
@ -52,8 +52,8 @@ jobs:
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: C:\Users\runneradmin\.ccache path: C:\Users\runneradmin\.ccache
key: ccache-windows-build-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ github.sha }}
restore-keys: ccache-windows-build- restore-keys: ccache-${{ runner.os }}-build-
- uses: eine/setup-msys2@v2 - uses: eine/setup-msys2@v2
with: with:
update: true update: true
@ -81,8 +81,8 @@ jobs:
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-build-${{ matrix.os }}-${{ github.sha }} key: ccache-${{ runner.os }}-build-${{ matrix.os }}-${{ github.sha }}
restore-keys: ccache-ubuntu-build-${{ matrix.os }} restore-keys: ccache-${{ runner.os }}-build-${{ matrix.os }}
- name: remove bundled boost - name: remove bundled boost
run: ${{env.REMOVE_BUNDLED_BOOST}} run: ${{env.REMOVE_BUNDLED_BOOST}}
- name: set apt conf - name: set apt conf
@ -106,8 +106,8 @@ jobs:
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-libwallet-${{ github.sha }} key: ccache-${{ runner.os }}-libwallet-${{ github.sha }}
restore-keys: ccache-ubuntu-libwallet- restore-keys: ccache-${{ runner.os }}-libwallet-
- name: remove bundled boost - name: remove bundled boost
run: ${{env.REMOVE_BUNDLED_BOOST}} run: ${{env.REMOVE_BUNDLED_BOOST}}
- name: set apt conf - name: set apt conf
@ -136,8 +136,8 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-build-ubuntu-latest-${{ github.sha }} key: ccache-${{ runner.os }}-build-ubuntu-latest-${{ github.sha }}
restore-keys: ccache-ubuntu-build-ubuntu-latest restore-keys: ccache-${{ runner.os }}-build-ubuntu-latest
- name: remove bundled boost - name: remove bundled boost
run: ${{env.REMOVE_BUNDLED_BOOST}} run: ${{env.REMOVE_BUNDLED_BOOST}}
- name: set apt conf - name: set apt conf