Skip to content

Commit

Permalink
ci: update cache action, fix inconsistencies
Browse files Browse the repository at this point in the history
  • Loading branch information
wait-what committed Jul 17, 2023
1 parent b76c7fa commit 5ec1689
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ on:
workflow_dispatch:

jobs:
build-mrxbuilder:
build:
strategy:
matrix:
target:
- name: x86_64-windows
triple: x86_64-pc-windows-msvc
extension: .exe
docker: ""
runner: windows-latest

- name: x86_64-linux-musl
Expand All @@ -27,7 +26,6 @@ jobs:
- name: x86_64-macos
triple: x86_64-apple-darwin
extension: ""
docker: ""
runner: macos-latest

runs-on: ${{ matrix.target.runner }}
Expand All @@ -36,14 +34,14 @@ jobs:
- uses: actions/checkout@v3

- name: Cache Cargo dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cargo
key: ${{ matrix.target.triple }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ matrix.target.triple }}-cargo-

- name: Cache build artifacts
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: target
key: ${{ matrix.target.triple }}-target-${{ hashFiles('**/Cargo.lock') }}
Expand Down Expand Up @@ -87,15 +85,15 @@ jobs:
name: ${{ matrix.target.name }}
path: mrxbuilder-v${{ steps.get_version.outputs.version }}-${{ matrix.target.name }}${{ matrix.target.extension }}

test-mrxbuilder:
test:
strategy:
matrix:
runner:
- ubuntu-latest
- macos-latest
- windows-latest

needs: build-mrxbuilder
needs: build
runs-on: ${{ matrix.runner }}

steps:
Expand Down Expand Up @@ -133,7 +131,7 @@ jobs:
path: out

publish-draft-release:
needs: test-mrxbuilder
needs: test
runs-on: ubuntu-latest

# Only run this job on manual trigger
Expand Down

0 comments on commit 5ec1689

Please sign in to comment.