.github: adjust workflows to new org

Signed-off-by: Joao Eduardo Luis <[email protected]>
s3gw-tech · Mar 19, 2024 · 80f5ba2 · 80f5ba2
1 parent 22eaac8
commit 80f5ba2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 47 deletions.
diff --git a/.github/workflows/gc.yaml b/.github/workflows/gc.yaml
@@ -3,10 +3,10 @@ name: Cleanup Docker
 on:
   workflow_dispatch: {}
 
-# The following job exists as three separate copies scheduled in parallel,
-# because this will let the three instances of the job be executed on all three
-# runners, otherwise some runners would never see a cleanup
 jobs:
+  # the following job should be duplicated for each existing runner, so all
+  # runners see their caches purged. We only have one runner now, so we only
+  # have one job.
   dockergc1:
     runs-on: self-hosted
     steps:
@@ -27,45 +27,3 @@ jobs:
         run: |
           docker builder prune --force
           docker system prune -a --volumes --force
-
-  dockergc2:
-    runs-on: self-hosted
-    steps:
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Context
-        run: |
-          docker context create builder
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: builder
-
-      - name: Docker Prune
-        run: |
-          docker builder prune --force
-          docker system prune -a --volumes --force
-
-  dockergc3:
-    runs-on: self-hosted
-    steps:
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Context
-        run: |
-          docker context create builder
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: builder
-
-      - name: Docker Prune
-        run: |
-          docker builder prune --force
-          docker system prune -a --volumes --force
diff --git a/.github/workflows/nightly-ui.yaml b/.github/workflows/nightly-ui.yaml
@@ -19,6 +19,7 @@ jobs:
         with:
           path: s3gw
           submodules: true
+          fetch-depth: 0
 
       - name: Checkout UI HEAD
         working-directory: s3gw/ui

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,6 +15,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
+          fetch-depth: 0
 
       - name: Quay Login
         uses: docker/login-action@v2
@@ -27,7 +28,6 @@ jobs:
         run: |
           docker build \
             --build-arg CMAKE_BUILD_TYPE=Release \
-            --build-arg NPROC=16 \
             --file Dockerfile \
             --tag s3gw-unittests \
             --target s3gw-unittests \
@@ -41,7 +41,6 @@ jobs:
         run: |
           docker build \
             --build-arg CMAKE_BUILD_TYPE=Release \
-            --build-arg NPROC=16 \
             --build-arg S3GW_VERSION=${{ github.ref_name }} \
             --build-arg QUAY_EXPIRATION=Never \
             --file Dockerfile \
@@ -62,6 +61,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          fetch-depth: 0
 
       - name: Install S3cmd
         run: |
@@ -137,6 +137,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
+          fetch-depth: 0
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -227,6 +228,9 @@ jobs:
       - pre-release-smoke-test
       - pre-release-on-disk-format-test
 
+    permissions:
+      contents: write
+
     steps:
 
       - name: Checkout