Ensure we upload all/noarch packages to S3.

northwood-labs · Apr 10, 2024 · 6fcf015 · 6fcf015
1 parent 96e8dfd
commit 6fcf015
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/generate-apk-meta.yml b/.github/workflows/generate-apk-meta.yml
@@ -28,7 +28,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Mount s3fs
+    name: s3fs
     strategy:
       fail-fast: false
 

diff --git a/.github/workflows/generate-deb-meta.yml b/.github/workflows/generate-deb-meta.yml
@@ -28,7 +28,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Mount s3fs
+    name: s3fs
     strategy:
       fail-fast: false
 

diff --git a/.github/workflows/generate-rpm-meta.yml b/.github/workflows/generate-rpm-meta.yml
@@ -28,7 +28,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Mount s3fs
+    name: s3fs
     strategy:
       fail-fast: false
 

diff --git a/.github/workflows/rebuild-all-images.yml b/.github/workflows/rebuild-all-images.yml
@@ -26,7 +26,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Docker build
+    name: "🛠️ Generate"
     permissions:
       packages: write
       contents: read
@@ -74,7 +74,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: "📦 Build the Docker image (multiarch)"
+      - name: "Build the Docker image (multiarch)"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |

diff --git a/.github/workflows/rebuild-images.yml b/.github/workflows/rebuild-images.yml
@@ -33,7 +33,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Build
+    name: "🛠️ Generate"
     permissions:
       packages: write
       contents: read
@@ -101,7 +101,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: "📦 Build the Docker image (multiarch)"
+      - name: "Build the Docker image (multiarch)"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -19,7 +19,7 @@ permissions: read-all
 
 jobs:
   analysis:
-    name: Scorecard analysis
+    name: 🔐 Scorecard analysis
     runs-on: ubuntu-latest
     permissions:
       # Needed to upload the results to code-scanning dashboard.

diff --git a/.github/workflows/upload-to-s3.yml b/.github/workflows/upload-to-s3.yml
@@ -33,7 +33,7 @@ permissions: read-all
 jobs:
   generate:
     runs-on: ubuntu-latest
-    name: Upload to S3
+    name: 🎯 Upload to S3
     strategy:
       fail-fast: false
 
@@ -68,6 +68,9 @@ jobs:
           if [[ -f $(find . -maxdepth 1 -type f -name "${{ inputs.package-name }}_*_amd64.deb") ]]; then
             aws s3 cp --sse=aws:kms --sse-kms-key-id="${AWSSSEKMSID}" ${{ inputs.package-name }}_*_amd64.deb s3://${PACKAGE_BUCKET}/apt/pool/main/
           fi
+          if [[ -f $(find . -maxdepth 1 -type f -name "${{ inputs.package-name }}_*_all.deb") ]]; then
+            aws s3 cp --sse=aws:kms --sse-kms-key-id="${AWSSSEKMSID}" ${{ inputs.package-name }}_*_all.deb s3://${PACKAGE_BUCKET}/apt/pool/main/
+          fi
 
           ARCH=("x86_64" "aarch64")
 
@@ -81,6 +84,11 @@ jobs:
             done
           done
 
+          # rpm noarch
+          if [[ -f $(find . -maxdepth 1 -type f -name "${{ inputs.package-name }}-*.noarch.rpm") ]]; then
+            aws s3 cp --sse=aws:kms --sse-kms-key-id="${AWSSSEKMSID}" ${{ inputs.package-name }}-*.noarch.rpm s3://${PACKAGE_BUCKET}/rpm/amazonlinux/${AL}/noarch/
+          fi
+
           # apk
           ALPINE=("3.17" "3.18" "3.19")
           for ALP in "${ALPINE[@]}"; do
@@ -90,3 +98,8 @@ jobs:
               fi
             done
           done
+
+          # apk noarch
+          if [[ -f $(find . -maxdepth 1 -type f -name "${{ inputs.package-name }}*_all.apk") ]]; then
+            aws s3 cp --sse=aws:kms --sse-kms-key-id="${AWSSSEKMSID}" ${{ inputs.package-name }}*_all.apk s3://${PACKAGE_BUCKET}/apk/v${ALP}/main/all/
+          fi
diff --git a/packages/jenkins-remoting-runner/nfpm.yaml b/packages/jenkins-remoting-runner/nfpm.yaml
@@ -3,7 +3,6 @@ arch: all
 platform: linux
 version: ${PKG_VER}
 version_schema: none
-version_metadata: git
 release: 1
 section: default
 maintainer: Northwood Labs <[email protected]>