Skip to content

Commit 8398b07

Browse files
committed
ci: updated release.yml and collect-assets to make them compatible with semver and test_kit_docker_build.sh
1 parent 95f77e1 commit 8398b07

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
run: |
136136
[ -n "${{ matrix.run }}" ] && ${{ matrix.run }} ${{ env.PHP_VERSION }} || true
137137
APP_ARCH=${{ matrix.arch }} \
138-
APP_VERSION=${{ needs.pack.outputs.version }} \
138+
APP_VERSION=${{ needs.pack.outputs.version_full }} \
139139
APP_NAME=${{ env.APP_NAME }} \
140140
RUNNER_OS="${{ runner.os }}" \
141141
DOCKER_IMAGE=${{ env.DOCKER_TAG }}:${{ needs.pack.outputs.version }} \
@@ -146,6 +146,7 @@ jobs:
146146
name: artifact-${{ matrix.os }}-${{ matrix.arch }}
147147
path: ./*${{ matrix.arch }}.tar.gz
148148

149+
# this step is important for the release process, because it creates the artifact for the dev version which is then put to github as a release asset and used by test_kit_docker_build.sh
149150
build-artifact-dev:
150151
runs-on: ubuntu-22.04
151152
needs:
@@ -188,7 +189,6 @@ jobs:
188189
path: .
189190
- name: Prepare packages structure
190191
run: |
191-
# name is like assets manticore-executor_v0.5.1-221214-e089052_linux_amd64:
192192
tar -xzf *.tar.gz
193193
194194
# Setup openssl workaround
@@ -294,7 +294,6 @@ jobs:
294294
path: .
295295
- name: Prepare package
296296
run: |
297-
# name is like assets manticore-executor_v0.5.1-221214-e089052_linux_arm64:
298297
tar -xzf *.tar.gz
299298
300299
# Setup openssl workaround

collect-assets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# ! Must be defined: APP_ARCH, APP_NAME, APP_VERSION, GITHUB_SHA, RUNNER_OS
99
# This script is part of tools to use in GitHub workflow
1010

11-
current_date=$( date +%y%m%d )
12-
APP_DATE=${APP_DATE:-$current_date}
13-
assets="${APP_NAME}-${APP_VERSION}+${APP_DATE}-${GITHUB_SHA:0:7}-$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')-${APP_ARCH}${ASSET_SUFFIX}"
11+
assets="${APP_NAME}-${APP_VERSION}-$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')-${APP_ARCH}${ASSET_SUFFIX}"
1412

1513
pwd
1614
echo "$assets"

0 commit comments

Comments
 (0)