diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b1e4d8..09936a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,8 @@ jobs: outputs: pkg-version: ${{ steps.pkg-version.outputs.PKG_VERSION }} steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -32,8 +33,11 @@ jobs: needs: "get-tag" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" - - uses: "taiki-e/create-gh-release-action@v1" + - name: "Check out the repo" + uses: actions/checkout@v3 + + - name: "Create release" + uses: "taiki-e/create-gh-release-action@v1" with: # (optional) Path to changelog. # changelog: CHANGELOG.md @@ -44,7 +48,9 @@ jobs: upload-assets: name: "Upload assets to Github releases" if: ${{ github.event.workflow_run.conclusion == 'success' }} - needs: "get-tag" + needs: + - "get-tag" + - "create-release" strategy: matrix: include: @@ -54,8 +60,11 @@ jobs: os: "ubuntu-latest" runs-on: ${{ matrix.os }} steps: - - uses: "actions/checkout@v3" - - uses: "taiki-e/upload-rust-binary-action@v1" + - name: "Check out the repo" + uses: actions/checkout@v3 + + - name: "Upload Binaries" + uses: "taiki-e/upload-rust-binary-action@v1" with: bin: "shazam" target: ${{ matrix.target }} @@ -71,6 +80,9 @@ jobs: - "upload-assets" runs-on: "ubuntu-latest" steps: + - name: "Check out the repo" + uses: actions/checkout@v3 + - name: "Log in to Docker Hub" uses: "docker/login-action@v2" with: diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 741e404..bf82c27 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -10,14 +10,17 @@ jobs: name: "Create tag" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} + - name: "Get tag" id: "get-tag" shell: "bash" run: | echo PKG_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' Cargo.toml) >> $GITHUB_OUTPUT + - name: "Set Tag" shell: "bash" run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf28528..131bd34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,12 +8,15 @@ jobs: name: "Cargo check" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 + - uses: "actions-rs/toolchain@v1" with: profile: "minimal" toolchain: "stable" override: true + - uses: "actions-rs/cargo@v1" with: command: "check" @@ -22,12 +25,15 @@ jobs: name: "Cargo test" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 + - uses: "actions-rs/toolchain@v1" with: profile: "minimal" toolchain: "stable" override: true + - uses: "actions-rs/cargo@v1" with: command: "test" @@ -36,13 +42,17 @@ jobs: name: "Cargo format" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 + - uses: "actions-rs/toolchain@v1" with: profile: "minimal" toolchain: "stable" override: true + - run: "rustup component add rustfmt" + - uses: "actions-rs/cargo@v1" with: command: "fmt" @@ -52,13 +62,17 @@ jobs: name: "Cargo clippy" runs-on: "ubuntu-latest" steps: - - uses: "actions/checkout@v3" + - name: "Check out the repo" + uses: actions/checkout@v3 + - uses: "actions-rs/toolchain@v1" with: profile: "minimal" toolchain: "stable" override: true + - run: "rustup component add clippy" + - uses: "actions-rs/cargo@v1" with: command: "clippy" diff --git a/Cargo.lock b/Cargo.lock index bbb0a6a..10ec623 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "shazam" -version = "0.1.62" +version = "0.1.63" dependencies = [ "anyhow", "axum", diff --git a/Cargo.toml b/Cargo.toml index b36df57..c6aaeaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shazam" -version = "0.1.62" +version = "0.1.63" edition = "2021" authors = ["Bradley Searle"] license = "MIT"