Skip to content

Commit 330c198

Browse files
authored
fix: ubuntu nightly workflow inputs (runfinch#1447)
Signed-off-by: Cezar Rata <[email protected]>
1 parent ff980fa commit 330c198

File tree

2 files changed

+14
-28
lines changed

2 files changed

+14
-28
lines changed

.github/workflows/build-and-test-deb.yaml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,11 @@ on:
66
ref_name:
77
required: true
88
type: string
9-
arch:
10-
type: string
11-
required: true
12-
output-arch:
13-
type: string
14-
required: true
159
workflow_call:
1610
inputs:
1711
ref_name:
1812
required: true
1913
type: string
20-
arch:
21-
type: string
22-
required: true
23-
output-arch:
24-
type: string
25-
required: true
2614
schedule:
2715
- cron: '0 9 * * *'
2816
env:
@@ -65,7 +53,16 @@ jobs:
6553
6654
ubuntu-deb-build-and-test:
6755
needs: get-tag-and-version
68-
runs-on: codebuild-finch-${{ inputs.arch }}-2-instance-${{ github.run_id }}-${{ github.run_attempt }}
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
arch: ['x86_64', 'arm64']
60+
include:
61+
- arch: 'x86_64'
62+
output-arch: 'amd64'
63+
- arch: 'arm64'
64+
output-arch: 'arm64'
65+
runs-on: codebuild-finch-${{ matrix.arch }}-2-instance-${{ github.run_id }}-${{ github.run_attempt }}
6966
timeout-minutes: 30
7067
steps:
7168
- name: Configure AWS credentials
@@ -93,15 +90,15 @@ jobs:
9390
sudo apt install libseccomp-dev -y
9491
sudo apt install pkg-config -y
9592
sudo apt install zlib1g-dev -y
96-
- name: Build for Ubuntu ${{ inputs.output-arch }}
93+
- name: Build for Ubuntu ${{ matrix.output-arch }}
9794
run: |
9895
make
9996
- name: Generate deb
10097
run: |
101-
./contrib/packaging/deb/package.sh --${{ inputs.output-arch }} --version ${{ needs.get-tag-and-version.outputs.version }}
98+
./contrib/packaging/deb/package.sh --${{ matrix.output-arch }} --version ${{ needs.get-tag-and-version.outputs.version }}
10299
- name: Install Finch
103100
run: |
104-
sudo apt install ./_output/deb/runfinch-finch_${{ needs.get-tag-and-version.outputs.version }}_${{ inputs.output-arch }}.deb -y
101+
sudo apt install ./_output/deb/runfinch-finch_${{ needs.get-tag-and-version.outputs.version }}_${{ matrix.output-arch }}.deb -y
105102
sudo systemctl daemon-reload
106103
sudo systemctl start containerd.service
107104
sudo systemctl restart finch.socket
@@ -126,5 +123,5 @@ jobs:
126123
sudo apt remove zlib1g-dev -y
127124
- name: Upload deb to S3
128125
run: |
129-
aws s3 cp ./_output/deb s3://${{ secrets.DEB_PRIVATE_BUCKET_NAME_UNSIGNED_PROD }}/ --recursive --exclude "*" --include "runfinch-finch_${{ needs.get-tag-and-version.outputs.version }}_${{ inputs.output-arch }}.deb"
126+
aws s3 cp ./_output/deb s3://${{ secrets.DEB_PRIVATE_BUCKET_NAME_UNSIGNED_PROD }}/ --recursive --exclude "*" --include "runfinch-finch_${{ needs.get-tag-and-version.outputs.version }}_${{ matrix.output-arch }}.deb"
130127
aws s3 cp ./contrib/packaging/deb/Release s3://${{ secrets.DEB_PRIVATE_BUCKET_NAME_UNSIGNED_PROD }}/

.github/workflows/release-automation.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,10 @@ jobs:
5252

5353
build-and-test-finch-deb:
5454
needs: get-latest-tag
55-
strategy:
56-
fail-fast: false
57-
matrix:
58-
arch: ['x86_64', 'arm64']
59-
include:
60-
- arch: 'x86_64'
61-
output-arch: 'amd64'
62-
- arch: 'arm64'
63-
output-arch: 'arm64'
6455
uses: ./.github/workflows/build-and-test-deb.yaml
6556
secrets: inherit
6657
with:
6758
ref_name: ${{ needs.get-latest-tag.outputs.tag }}
68-
arch: ${{ matrix.arch }}
69-
output-arch: ${{ matrix.output-arch }}
7059

7160
upload-deb-to-release:
7261
needs:

0 commit comments

Comments
 (0)