Skip to content

Commit 874c0a6

Browse files
committed
Release workflow fix
Signed-off-by: Janos SUTO <[email protected]>
1 parent 92419e8 commit 874c0a6

File tree

4 files changed

+39
-24
lines changed

4 files changed

+39
-24
lines changed

.github/actions/build/image/action.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ runs:
3232
username: ${{ inputs.DOCKER_USERNAME }}
3333
password: ${{ inputs.DOCKER_TOKEN }}
3434

35-
- name: Download package
36-
uses: actions/download-artifact@v4
37-
with:
38-
path: docker
39-
4035
- name: Build image from package
4136
uses: docker/build-push-action@v5
4237
with:

.github/actions/build/package/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ runs:
3030
- name: Build package
3131
id: build-package
3232
run: |
33+
uname -a
3334
docker run --rm \
3435
-e PROJECT_ID=${{ inputs.PROJECT_ID }} \
3536
-e DISTRO=${{ inputs.DISTRO }} \

.github/workflows/release.yaml

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ permissions:
1616
jobs:
1717
get-version:
1818
runs-on:
19-
- self-hosted
20-
- X64
19+
- ubuntu-latest
2120

2221
outputs:
2322
IMAGE_TAG: ${{ steps.get-version.outputs.IMAGE_TAG }}
@@ -36,20 +35,34 @@ jobs:
3635
id: get-version
3736
uses: ./.github/actions/version
3837

39-
build-package:
38+
build-package-amd64:
4039
needs:
4140
- get-version
4241

43-
strategy:
44-
matrix:
45-
arch: ['amd64','arm64']
42+
runs-on:
43+
- ubuntu-latest
44+
45+
steps:
46+
- uses: actions/checkout@v4
47+
48+
- name: Build package
49+
id: build-package
50+
uses: ./.github/actions/build/package
51+
with:
52+
ARCH: amd64
53+
COMMIT_ID: ${{ needs.get-version.outputs.COMMIT_ID }}
54+
DISTRO: ${{ env.DISTRO }}
55+
IMAGE_NAME: ${{ env.IMAGE_NAME }}:${{ env.DISTRO }}-${{ matrix.arch }}
56+
PROJECT_ID: 'piler'
57+
VERSION: ${{ needs.get-version.outputs.VERSION }}
58+
59+
build-package-arm64:
60+
needs:
61+
- get-version
4662

4763
runs-on:
4864
- self-hosted
49-
- ${{ matrix.arch }}
50-
51-
outputs:
52-
PACKAGE: ${{ steps.build-package.outputs.PACKAGE }}
65+
- ARM64
5366

5467
steps:
5568
- uses: actions/checkout@v4
@@ -58,7 +71,7 @@ jobs:
5871
id: build-package
5972
uses: ./.github/actions/build/package
6073
with:
61-
ARCH: ${{ matrix.arch }}
74+
ARCH: arm64
6275
COMMIT_ID: ${{ needs.get-version.outputs.COMMIT_ID }}
6376
DISTRO: ${{ env.DISTRO }}
6477
IMAGE_NAME: ${{ env.IMAGE_NAME }}:${{ env.DISTRO }}-${{ matrix.arch }}
@@ -68,13 +81,15 @@ jobs:
6881
build-image:
6982
needs:
7083
- get-version
71-
- build-package
84+
- build-package-amd64
85+
- build-package-arm64
7286

7387
runs-on:
74-
- self-hosted
75-
- X64
88+
- ubuntu-latest
7689

7790
steps:
91+
- uses: actions/checkout@v4
92+
7893
- name: Download packages
7994
uses: actions/download-artifact@v4
8095
with:
@@ -94,13 +109,14 @@ jobs:
94109

95110
create-release:
96111
needs:
97-
- build-package
112+
- build-image
98113

99114
runs-on:
100-
- self-hosted
101-
- X64
115+
- ubuntu-latest
102116

103117
steps:
118+
- uses: actions/checkout@v4
119+
104120
- name: Download packages
105121
uses: actions/download-artifact@v4
106122
with:

.github/workflows/test.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
- synchronize # commit pushed to PR
88
- reopened # closed PR reopened
99

10+
concurrency:
11+
group: ${{ github.ref_name == 'master' && 'master' || github.ref_name }}
12+
cancel-in-progress: ${{ github.ref_name != 'master' }}
13+
1014
env:
1115
ARCHIVE_HOST: test1.acts.hu
1216
IMAGE_NAME: sutoj/piler
@@ -20,8 +24,7 @@ env:
2024
jobs:
2125
get-version:
2226
runs-on:
23-
- self-hosted
24-
- X64
27+
- ubuntu-latest
2528

2629
outputs:
2730
IMAGE_TAG: ${{ steps.get-version.outputs.IMAGE_TAG }}

0 commit comments

Comments
 (0)