some release fixes

epinio · Jul 26, 2023 · 10ea613 · 10ea613
1 parent 05af74e
commit 10ea613
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml
@@ -78,9 +78,10 @@ jobs:
 
       -
         name: Run GoReleaser Cross
-        run: ./backend/build/bk-release.sh release --rm-dist -f ./dashboard/goreleaser-next.yml
+        run: ./backend/build/bk-release.sh release --rm-dist -f ./backend/.goreleaser-next.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UI_BUNDLE_URL: "dev"
           # The "id-token: write" permission for the OIDC will set the ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN
           # environment variables. Since we are running goreleaser-cross from a Docker image we need to pass those to the script and the container.
           # See: https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#updating-your-actions-for-oidc

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -72,9 +72,10 @@ jobs:
           LOGIN_LOCALE_SELECTOR: false
       -
         name: Run GoReleaser Cross
-        run: ./backend/build/bk-release.sh release --rm-dist -f ./dashboard/goreleaser.yml
+        run: ./backend/build/bk-release.sh release --rm-dist -f ./backend/.goreleaser.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UI_BUNDLE_URL: ""
           # The "id-token: write" permission for the OIDC will set the ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN
           # environment variables. Since we are running goreleaser-cross from a Docker image we need to pass those to the script and the container.
           # See: https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#updating-your-actions-for-oidc

diff --git a/backend/.goreleaser-next.yml b/backend/.goreleaser-next.yml
@@ -92,7 +92,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{ incminor .Version }}-next"
-    - "--label=epinio.io.ui.source=dev"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/amd64"
@@ -119,7 +119,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{ incminor .Version }}-next"
-    - "--label=epinio.io.ui.source=dev"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/arm64/v8"
@@ -146,7 +146,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{ incminor .Version }}-next"
-    - "--label=epinio.io.ui.source=dev"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/s390x"

diff --git a/backend/.goreleaser.yml b/backend/.goreleaser.yml
@@ -95,6 +95,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{.Version}}"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/amd64"
@@ -136,6 +137,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{.Version}}"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/arm64/v8"
@@ -177,6 +179,7 @@ dockers:
     - "--label=org.opencontainers.image.title={{.ProjectName}}"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
     - "--label=org.opencontainers.image.version={{.Version}}"
+    - "--label=epinio.io.ui.source={{.Env.UI_BUNDLE_URL}}"
     - "--label=org.opencontainers.image.source=https://github.com/epinio/ui"
     - "--build-arg=DIST_BINARY=epinio-ui"
     - "--platform=linux/s390x"