Merge branch 'main' into logger

containers · Oct 10, 2023 · e3deee7 · e3deee7
2 parents 42ff85b + 1e8f249
commit e3deee7
Show file tree

Hide file tree

Showing 15 changed files with 185 additions and 175 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,10 +115,21 @@ jobs:
         with:
           path: ${{ github.sha }}
           destination: cri-o/conmon-rs
+
+  create-marker:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags')
+    needs:
+      - release-static
+      - build-static
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - run: .github/create-marker
-        if: github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags')
+      - uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCS_CRIO_SA }}
       - uses: google-github-actions/upload-cloud-storage@v1
-        if: github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags')
         with:
           path: .
           glob: latest-*.txt
@@ -333,6 +344,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/[email protected].11
+      - uses: crate-ci/[email protected].17
         with:
           config: .github/typos.toml