build: some small fixes to CI (#27)

- (hopefully) properly publish Docker images with versions on ghcr.io - (hopefully) properly cache librocksdb-sys with rust-cache Release-As: 0.1.6
varfish-org · Jun 19, 2023 · 06177e7 · 06177e7
1 parent 42be77f
commit 06177e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -2,7 +2,7 @@
 #
 # This builds the containers with version tags.  The `main` and `latest` tags are
 # pushed in `docker-build.yml`.
-name: Release Package/Image
+name: Release
 
 on:
   push:
@@ -20,19 +20,25 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       release_created: ${{ steps.release.outputs.release_created }}
+      release_name: ${{ steps.release.outputs.release_name }}
     steps:
       - uses: GoogleCloudPlatform/release-please-action@v3
         id: release
         with:
           release-type: rust
           package-name: ${{ env.PACKAGE_NAME}}
 
+  cargo-release:
+    needs: release-please
+    runs-on: ubuntu-latest
+    if: ${{ needs.release-please.outputs.release_created }}
+    steps:
       - uses: actions/checkout@v3
-        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ needs.release-please.outputs.release_created }}
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
-        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ needs.release-please.outputs.release_created }}
         with:
           toolchain: stable
           override: true
@@ -43,10 +49,13 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: Swatinem/rust-cache@v2
-        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ needs.release-please.outputs.release_created }}
+        with:
+          cache-directories: |
+            ~/.cargo/registry/src/**/librocksdb-sys-*
 
       - name: Publish crate
-        if: ${{ steps.release.outputs.release_created }}
+        if: ${{ needs.release-please.outputs.release_created }}
         uses: actions-rs/cargo@v1
         with:
           command: publish
@@ -74,9 +83,9 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern={{version}},value=${{ needs.release-please.outputs.release_name }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ needs.release-please.outputs.release_name }}
+            type=semver,pattern={{major}},value=${{ needs.release-please.outputs.release_name }}
             type=sha
 
       - name: Build and push Docker image

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -49,6 +49,11 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-directories: |
+            ~/.cargo/registry/src/**/librocksdb-sys-*
+
       - name: Lint with clippy
         uses: actions-rs/clippy-check@v1
         with:
@@ -75,6 +80,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          cache-directories: |
+            ~/.cargo/registry/src/**/librocksdb-sys-*
 
       - name: Run cargo-tarpaulin
         uses: actions-rs/tarpaulin@v0.1