Skip to content

Commit 953508e

Browse files
committed
Merge remote-tracking branch 'origin/feature/merge-124.1.7-tag' into w/125.0/feature/merge-124.1.7-tag
2 parents 6591a73 + f3345d6 commit 953508e

File tree

4 files changed

+43
-4
lines changed

4 files changed

+43
-4
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,18 @@ jobs:
126126
- name: Build shell-ui container image
127127
run: docker build . --tag shell-ui:v$SHELL_UI_VERSION
128128
working-directory: shell-ui
129+
- name: Extract shell folder from shell-ui container
130+
run: |
131+
docker create --name shell-ui shell-ui:v$SHELL_UI_VERSION
132+
docker cp shell-ui:/usr/share/nginx/html/shell .
133+
docker rm shell-ui
134+
tar cvf shell.tar shell
129135
- name: Save shell-ui container image
130136
run: >
131137
docker save shell-ui:v$SHELL_UI_VERSION |
132138
gzip > shell-ui.tar.gz
133139
- name: Prepare artifacts
134-
run: mkdir -p "artifacts/images" && mv shell-ui.tar.gz artifacts/images/
140+
run: mkdir -p "artifacts/images" && mv shell-ui.tar.gz artifacts/images/ && mv shell.tar artifacts/images/
135141
- name: Upload artifacts
136142
uses: scality/action-artifacts@v3
137143
with:

.github/workflows/publish.yaml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ jobs:
3535
runs-on: ubuntu-20.04
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
39+
with:
40+
# NOTE: We fetch depth since fetch tags only does not works
41+
# Sees: https://github.com/actions/checkout/issues/1471
42+
fetch-depth: 0
3943
- name: Set up Docker Buildx
4044
uses: docker/setup-buildx-action@v2
4145

@@ -54,6 +58,10 @@ jobs:
5458
run: >
5559
curl --fail -LO -u ${{ secrets.ARTIFACTS_USER }}:${{ secrets.ARTIFACTS_PASSWORD }}
5660
${{ inputs.artifacts-url || steps.artifacts.outputs.link }}/images/shell-ui.tar.gz
61+
- name: Retrieve shell archive from artifacts
62+
run: >
63+
curl --fail -LO -u ${{ secrets.ARTIFACTS_USER }}:${{ secrets.ARTIFACTS_PASSWORD }}
64+
${{ inputs.artifacts-url || steps.artifacts.outputs.link }}/images/shell.tar
5765
- name: Load shell-ui image
5866
run: docker load < shell-ui.tar.gz
5967
- name: Retrieve product.txt from artifacts
@@ -127,3 +135,26 @@ jobs:
127135
docker push --all-tags
128136
"${{ env.REGISTRY_HOST }}/${{ env.REGISTRY_PROJECT }}/shell-ui"
129137
138+
- name: Get tag message
139+
if: inputs.is_production
140+
id: get_tag_message
141+
# Explicitly fetching tags since checkout fetch-tags does not works well
142+
# Sees: https://github.com/actions/checkout/issues/1471
143+
run: |-
144+
git fetch --tags
145+
echo "message<<EOF" >> $GITHUB_OUTPUT
146+
git tag -l --format='%(contents)' "${{ env.SHELL_UI_VERSION }}" | tail -n +4 >> $GITHUB_OUTPUT
147+
echo "EOF" >> $GITHUB_OUTPUT
148+
149+
- uses: softprops/action-gh-release@v2
150+
if: inputs.is_production
151+
with:
152+
name: Metalk8s ${{ env.SHELL_UI_VERSION }}
153+
tag_name: ${{ env.SHELL_UI_VERSION }}
154+
body: ${{ steps.get_tag_message.outputs.message }}
155+
prerelease: "${{ ! fromJSON(env.IS_STABLE) }}"
156+
draft: false
157+
files: |
158+
shell.tar
159+
env:
160+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,9 @@
211211
- `container_(file_descriptors|tasks_state|threads_max)`
212212
- `container_spec.*`
213213

214-
## Release 124.1.7 (in development)
214+
## Release 124.1.8 (in development)
215+
216+
## Release 124.1.7
215217

216218
### Additions
217219

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
VERSION_MAJOR=125
22
VERSION_MINOR=0
33
VERSION_PATCH=7
4-
VERSION_SUFFIX=-dev
4+
VERSION_SUFFIX=-dev

0 commit comments

Comments
 (0)