fix ci, attempt 2 (#25)

* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
anoma · May 17, 2024 · 7e88faa · 7e88faa
1 parent e7b28dc
commit 7e88faa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+  merge_group:
 
 concurrency:
   group: ${{ github.ref }}
@@ -16,15 +17,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
-      - name: Install Protoc
-        uses: heliaxdev/setup-protoc@v2
+      - uses: rui314/setup-mold@v1
+      - uses: heliaxdev/setup-protoc@v2
         with:
           version: "25.0"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: true
-          cache-workspaces: true
       - run: just clippy
 
   format:
@@ -33,8 +33,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
-      - name: Install Protoc
-        uses: heliaxdev/setup-protoc@v2
+      - uses: rui314/setup-mold@v1
+      - uses: heliaxdev/setup-protoc@v2
         with:
           version: "25.0"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -43,24 +43,23 @@ jobs:
           toolchain: nightly
           components: rustfmt
           cache: true
-          cache-workspaces: true
       - run: just fmt
 
   build:
+    if: ${{ github.event_name == 'pull_request' }}
     name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
-      - name: Install Protoc
-        uses: heliaxdev/setup-protoc@v2
+      - uses: rui314/setup-mold@v1
+      - uses: heliaxdev/setup-protoc@v2
         with:
           version: "25.0"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: true
-          cache-workspaces: true
       - run: just build
 
   dependencies:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -7,22 +7,24 @@ on:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
   merge_group:
+  pull_request:
 
 
 env:
   GIT_LFS_SKIP_SMUDGE: 1
   REGISTRY_URL: ghcr.io
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
-  build-docker:
+  build:
+    name: Build
     runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-
+    if: ${{ github.event_name == 'merge_group' }}
+
     strategy:
       fail-fast: true
       matrix: