This commit is contained in:
Lev 2021-11-06 20:43:40 +03:00
parent 3f08e00850
commit c0470664a6
3 changed files with 10 additions and 11 deletions

View file

@ -16,3 +16,7 @@ ERPNEXT_VERSION=$(get_tag frappe/erpnext "$VERSION")
echo "FRAPPE_VERSION=$FRAPPE_VERSION" >>$GITHUB_ENV echo "FRAPPE_VERSION=$FRAPPE_VERSION" >>$GITHUB_ENV
# shellcheck disable=SC2086 # shellcheck disable=SC2086
echo "ERPNEXT_VERSION=$ERPNEXT_VERSION" >>$GITHUB_ENV echo "ERPNEXT_VERSION=$ERPNEXT_VERSION" >>$GITHUB_ENV
# shellcheck disable=SC2086
echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
# shellcheck disable=SC2086
echo "VERSION=$VERSION" >>$GITHUB_ENV

View file

@ -42,11 +42,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Get latest versions - name: Get latest versions
run: | run: ./.github/scripts/get-latest-tags.sh
./.github/scripts/get-latest-tags.sh
echo "VERSION=$VERSION" >>$GITHUB_ENV
echo "GIT_TAG=$FRAPPE_VERSION" >>$GITHUB_ENV
echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
@ -67,6 +63,8 @@ jobs:
files: docker-bake.hcl files: docker-bake.hcl
targets: frappe-stable targets: frappe-stable
push: false push: false
env:
GIT_TAG: ${{ env.FRAPPE_VERSION }}
build_erpnext: build_erpnext:
name: ERPNext name: ERPNext
@ -91,11 +89,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Get latest versions - name: Get latest versions
run: | run: ./.github/scripts/get-latest-tags.sh
./.github/scripts/get-latest-tags.sh
echo "VERSION=$VERSION" >>$GITHUB_ENV
echo "GIT_TAG=$ERPNEXT" >>$GITHUB_ENV
echo "GIT_BRANCH=version-$VERSION" >>$GITHUB_ENV
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
@ -116,6 +110,8 @@ jobs:
files: docker-bake.hcl files: docker-bake.hcl
targets: erpnext-stable targets: erpnext-stable
push: false push: false
env:
GIT_TAG: ${{ env.ERPNEXT_VERSION }}
release_helm: release_helm:
name: Release Helm name: Release Helm

View file

@ -47,7 +47,6 @@ variable "VERSION" {}
target "stable-args" { target "stable-args" {
args = { args = {
GIT_TAG = "${GIT_TAG}"
GIT_BRANCH = "${GIT_BRANCH}" GIT_BRANCH = "${GIT_BRANCH}"
IMAGE_TAG = "${GIT_BRANCH}" IMAGE_TAG = "${GIT_BRANCH}"
} }