ci: fixes on release.yml and test-build.yml

lacework · Feb 23, 2024 · b94850b · b94850b
1 parent 9bb4d66
commit b94850b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v*'
 
 jobs:
   release:
@@ -66,6 +66,9 @@ jobs:
           scripts/release.sh publish
 
       - name: Build/Push Docker Image
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASSWORD }}
         run: |
           scripts/release_containers.sh
 

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -86,6 +86,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
 
       - name: Trigger release
         env:

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -271,6 +271,7 @@ push_release() {
   log "commiting and pushing the release to github"
   _version_no_tag=$(echo $VERSION | awk -F. '{printf("%d.%d.%d", $1, $2, $3)}')
   if [ "$CI" != "" ]; then
+    log "configuring git user email, user name and signingkey"
     git config --global user.email $git_email
     git config --global user.name $git_user
     git config --global user.signingkey $GPG_SIGNING_KEY
@@ -387,6 +388,7 @@ bump_version() {
 
   log "commiting and pushing the vertion bump to github"
   if [ "$CI" != "" ]; then
+    log "configuring git user email, user name and signingkey"
     git config --global user.email $git_email
     git config --global user.name $git_user
     git config --global user.signingkey $GPG_SIGNING_KEY