Skip to content

Commit 9bab193

Browse files
authored
Merge pull request #87 from yue9944882/fix/release-job-env-ref
Fix: Release job env ref
2 parents 3228342 + c7ca76d commit 9bab193

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

.github/workflows/go-release.yml

+21-26
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ jobs:
3636
run: |
3737
cat ./charts/cluster-gateway/Chart.yaml | grep -q 'version: ${{ env.TRIMED_RELEASE_VERSION }}'
3838
cat ./charts/addon-manager/Chart.yaml | grep -q 'version: ${{ env.TRIMED_RELEASE_VERSION }}'
39-
- name: export env
40-
id: export
41-
run: |
42-
echo "::set-output TRIMED_RELEASE_VERSION=${{ env.TRIMED_RELEASE_VERSION }}"
43-
echo "::set-output RELEASE_VERSION=${{ env.RELEASE_VERSION }}"
4439
image-multi-arch:
4540
name: multi arch image build
4641
runs-on: ubuntu-latest
@@ -60,15 +55,15 @@ jobs:
6055
go-version: ${{ env.GO_VERSION }}
6156
- name: images multi arch
6257
run: |
63-
IMG_TAG=${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-${{ matrix.arch }} \
58+
IMG_TAG=${{ env.RELEASE_VERSION }}-${{ matrix.arch }} \
6459
OS=linux \
6560
ARCH=${{ matrix.arch }} \
6661
make image
6762
- name: push image multi arch
6863
run: |
6964
echo ${{ secrets.DOCKER_PASSWORD }} | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin
70-
docker push oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
71-
docker push oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
65+
docker push oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}-${{ matrix.arch }}
66+
docker push oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}-${{ matrix.arch }}
7267
image-manifest:
7368
name: release
7469
runs-on: ubuntu-latest
@@ -82,26 +77,26 @@ jobs:
8277
- name: create
8378
run: |
8479
echo ${{ secrets.DOCKER_PASSWORD }} | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin
85-
docker manifest create oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
86-
oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-amd64 \
87-
oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-arm64
88-
docker manifest create oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
89-
oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-amd64 \
90-
oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-arm64
80+
docker manifest create oamdev/cluster-gateway:${{ env.RELEASE_VERSION }} \
81+
oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}-amd64 \
82+
oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}-arm64
83+
docker manifest create oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }} \
84+
oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}-amd64 \
85+
oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}-arm64
9186
- name: annotate
9287
run: |
93-
docker manifest annotate oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
94-
oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-amd64 --arch amd64
95-
docker manifest annotate oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
96-
oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-arm64 --arch arm64
97-
docker manifest annotate oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
98-
oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-amd64 --arch amd64
99-
docker manifest annotate oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }} \
100-
oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}-arm64 --arch arm64
88+
docker manifest annotate oamdev/cluster-gateway:${{ env.RELEASE_VERSION }} \
89+
oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}-amd64 --arch amd64
90+
docker manifest annotate oamdev/cluster-gateway:${{ env.RELEASE_VERSION }} \
91+
oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}-arm64 --arch arm64
92+
docker manifest annotate oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }} \
93+
oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}-amd64 --arch amd64
94+
docker manifest annotate oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }} \
95+
oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}-arm64 --arch arm64
10196
- name: push
10297
run: |
103-
docker manifest push oamdev/cluster-gateway:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}
104-
docker manifest push oamdev/cluster-gateway-addon-manager:${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}
98+
docker manifest push oamdev/cluster-gateway:${{ env.RELEASE_VERSION }}
99+
docker manifest push oamdev/cluster-gateway-addon-manager:${{ env.RELEASE_VERSION }}
105100
release:
106101
name: release
107102
runs-on: ubuntu-latest
@@ -124,7 +119,7 @@ jobs:
124119
- name: publish release
125120
uses: ncipollo/release-action@v1
126121
with:
127-
tag: ${{ jobs.env.steps.export.outputs.RELEASE_VERSION }}
122+
tag: ${{ env.RELEASE_VERSION }}
128123
artifacts: "go/src/oamdev/cluster-gateway/release/*.tgz"
129124
token: ${{ secrets.GITHUB_TOKEN }}
130125
- name: submit charts to OCM chart repo
@@ -141,7 +136,7 @@ jobs:
141136
ref: 'main',
142137
inputs: {
143138
repo: "${{ github.repository }}",
144-
version: "${{ jobs.env.steps.export.outputs.TRIMED_RELEASE_VERSION }}",
139+
version: "${{ env.TRIMED_RELEASE_VERSION }}",
145140
"chart-name": "cluster-gateway-addon-manager",
146141
},
147142
})

0 commit comments

Comments
 (0)