Skip to content

Commit 7cdee52

Browse files
committed
Fix workflow
1 parent 4e42e5b commit 7cdee52

1 file changed

Lines changed: 8 additions & 27 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -73,47 +73,28 @@ jobs:
7373
- run: build/makerpm.sh ${{matrix.image}}
7474
- uses: actions/upload-artifact@v4
7575
with:
76-
name: statshouse-pkg-rpm-${{needs.env.outputs.version}}${{strategy.job-index}}
76+
name: statshouse-pkg-rpm-${{needs.env.outputs.version}}-${{strategy.job-index}}
7777
path: RPMS/*.rpm
78-
debian:
78+
deb:
7979
strategy:
8080
matrix:
81-
release: [bullseye, bookworm]
82-
needs: [env, frontend]
81+
release: [debian-bullseye, debian-bookworm, ubuntu-focal, ubuntu-jammy]
82+
needs: [env]
8383
runs-on: ubuntu-latest
8484
steps:
8585
- uses: actions/checkout@v4
8686
with:
8787
repository: VKCOM/statshouse
8888
ref: ${{needs.env.outputs.ref}}
8989
fetch-depth: 0
90-
- run: echo "BUILD_VERSION=`echo ${{needs.env.outputs.version}} | sed -e 's:-:.:g'`" >> $GITHUB_ENV
91-
- run: build/make-pkg.sh debian-${{matrix.release}}
92-
- uses: actions/upload-artifact@v4
93-
with:
94-
name: statshouse-pkg-debian-${{inputs.version}}${{github.run_number}}${{strategy.job-index}}
95-
path: target/debian-${{matrix.release}}/*.deb
96-
ubuntu:
97-
strategy:
98-
matrix:
99-
release: [focal, jammy]
100-
needs: [env, frontend]
101-
runs-on: ubuntu-latest
102-
steps:
103-
- uses: actions/checkout@v4
104-
with:
105-
repository: VKCOM/statshouse
106-
ref: ${{needs.env.outputs.ref}}
107-
fetch-depth: 0
108-
- run: echo "BUILD_VERSION=`echo ${{needs.env.outputs.version}} | sed -e 's:-:.:g'`" >> $GITHUB_ENV
109-
- run: build/make-pkg.sh ubuntu-${{matrix.release}}
90+
- run: build/make-pkg.sh ${{matrix.release}}
11091
- uses: actions/upload-artifact@v4
11192
with:
112-
name: statshouse-pkg-ubuntu-${{inputs.version}}${{github.run_number}}${{strategy.job-index}}
113-
path: target/ubuntu-${{matrix.release}}/*.deb
93+
name: statshouse-pkg-${{needs.env.outputs.version}}-${{github.run_number}}-${{matrix.release}}
94+
path: target/${{matrix.release}}/*.deb
11495
draft_release:
11596
if: ${{ github.event.inputs.draft_release }}
116-
needs: [env, rpm, ubuntu, debian]
97+
needs: [env, rpm, deb]
11798
runs-on: ubuntu-latest
11899
steps:
119100
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)