Merge pull request #5982 from mysteriumnetwork/ci-migration

Setup buildX engine for docker release
mysteriumnetwork · Feb 21, 2024 · 4e0555a · 4e0555a
2 parents 4e55638 + 83904f5
commit 4e0555a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -43,8 +43,6 @@ jobs:
           PR_BUILD=false
           if [[ "${SNAPSHOT_BUILD}" == "false" && "${RELEASE_BUILD}" == "false" ]]; then PR_BUILD=true; fi
 
-          BUILD_NUMBER="${{ github.run_id }}"-ghactions
-
           if [[ "${RELEASE_BUILD}" == "true" ]]; then 
             BUILD_VERSION="${GITHUB_REF#/refs/tags/}";
           elif [[ "${SNAPSHOT_BUILD}" == "true" ]]; then
@@ -60,8 +58,10 @@ jobs:
           export RC_BUILD=$RC_BUILD;
           export PR_BUILD=$PR_BUILD;
           export SNAPSHOT_BUILD=$SNAPSHOT_BUILD;
-          export BUILD_NUMBER=$BUILD_NUMBER;
           export BUILD_VERSION=$BUILD_VERSION;
+          export BUILD_NUMBER="${{ github.run_id }}"-ghactions;
+          export BUILD_COMMIT="$(echo ${GITHUB_SHA} | cut -c1-8)";
+          export BUILD_BRANCH="${GITHUB_REF_NAME}";
           EOT
 
       - uses: actions/upload-artifact@v4
@@ -107,9 +107,8 @@ jobs:
         with:
           name: env.sh
 
-      - name: Setup Debber and FPM
+      - name: Setup FPM
         run: |
-          go install github.com/debber/debber-v0.3/cmd/debber@latest
           sudo apt-get install ruby-dev build-essential
           sudo gem i fpm -f
       

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,6 +10,7 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_EC2_METADATA_DISABLED: true
+  GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
 
 jobs:
   release-snapshot:
@@ -36,6 +37,16 @@ jobs:
         with:
           name: env.sh
           github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+           username: ${{ secrets.DOCKERHUB_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Deb build scripts
+        run: sudo apt-get install devscripts build-essential lintian dput
 
       - name: Release snapshot
         run: |
@@ -70,6 +81,16 @@ jobs:
         with:
           name: env.sh
           github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+           username: ${{ secrets.DOCKERHUB_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install Deb build scripts
+        run: sudo apt-get install devscripts build-essential lintian dput
 
       - name: Release tag
         run: |