Skip to content

Commit 3ef2ce2

Browse files
everpcpceverpcpc
authored
ci: fix pack deb (#17832)
1 parent 22ed57a commit 3ef2ce2

File tree

4 files changed

+37
-39
lines changed

4 files changed

+37
-39
lines changed

‎.github/actions/pack_deb/action.yml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ runs:
4747
aarch64)
4848
echo "deb_arch=arm64" >> $GITHUB_OUTPUT
4949
;;
50+
*)
51+
echo "Unsupported arch: ${{ inputs.arch }}"
52+
exit 1
53+
;;
5054
esac
5155
deb_version=${version/-/.}
5256
echo "deb_version=${deb_version/v/}" >> $GITHUB_OUTPUT
@@ -59,32 +63,26 @@ runs:
5963
- name: Build Databend Query Package
6064
shell: bash
6165
run: |
62-
export path="distro"
63-
export version="${{ inputs.version }}"
64-
export deb_version="${{ steps.info.outputs.deb_version }}"
65-
export deb_arch="${{ steps.info.outputs.deb_arch }}"
66-
pkg_name="databend-query_${deb_version}_${deb_arch}.deb"
67-
nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${deb_arch} ${deb_version} ${path}' < scripts/distribution/nfpm-query.yaml)
66+
yq -i '.arch = "${{ steps.info.outputs.deb_arch }}"' scripts/distribution/nfpm-query.yaml
67+
yq -i '.version = "${{ steps.info.outputs.deb_version }}"' scripts/distribution/nfpm-query.yaml
68+
pkg_name="databend-query_${{ steps.info.outputs.deb_version }}_${{ steps.info.outputs.deb_arch }}.deb"
69+
nfpm pkg --packager deb -t "distro/${pkg_name}" -f scripts/distribution/nfpm-query.yaml
6870
6971
- name: Build Databend Meta Package
7072
shell: bash
7173
run: |
72-
export path="distro"
73-
export version="${{ inputs.version }}"
74-
export deb_version="${{ steps.info.outputs.deb_version }}"
75-
export deb_arch="${{ steps.info.outputs.deb_arch }}"
76-
pkg_name="databend-meta_${deb_version}_${deb_arch}.deb"
77-
nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${deb_arch} ${deb_version} ${path}' < scripts/distribution/nfpm-meta.yaml)
74+
yq -i '.arch = "${{ steps.info.outputs.deb_arch }}"' scripts/distribution/nfpm-meta.yaml
75+
yq -i '.version = "${{ steps.info.outputs.deb_version }}"' scripts/distribution/nfpm-meta.yaml
76+
pkg_name="databend-meta_${{ steps.info.outputs.deb_version }}_${{ steps.info.outputs.deb_arch }}.deb"
77+
nfpm pkg --packager deb -t "distro/${pkg_name}" -f scripts/distribution/nfpm-meta.yaml
7878
7979
- name: Build Databend Debug Package
8080
shell: bash
8181
run: |
82-
export path="distro"
83-
export version="${{ inputs.version }}"
84-
export deb_version="${{ steps.info.outputs.deb_version }}"
85-
export deb_arch="${{ steps.info.outputs.deb_arch }}"
86-
pkg_name="databend-query-dbg_${deb_version}_${deb_arch}.deb"
87-
nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${deb_arch} ${deb_version} ${path}' < scripts/distribution/nfpm-query-dbg.yaml)
82+
yq -i '.arch = "${{ steps.info.outputs.deb_arch }}"' scripts/distribution/nfpm-query-dbg.yaml
83+
yq -i '.version = "${{ steps.info.outputs.deb_version }}"' scripts/distribution/nfpm-query-dbg.yaml
84+
pkg_name="databend-query-dbg_${{ steps.info.outputs.deb_version }}_${{ steps.info.outputs.deb_arch }}.deb"
85+
nfpm pkg --packager deb -t "distro/${pkg_name}" -f scripts/distribution/nfpm-query-dbg.yaml
8886
8987
- name: Update release to github
9088
shell: bash

‎scripts/distribution/nfpm-meta.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "databend-meta"
2-
arch: "${deb_arch}"
2+
arch: "${arch}"
33
platform: "linux"
4-
version: "${deb_version}"
4+
version: "${version}"
55
section: "database"
66
priority: "extra"
77
maintainer: "Databend Labs <[email protected]>"
@@ -15,20 +15,20 @@ depends:
1515
- libc6 (>= 2.31)
1616
contents:
1717
# Binaries
18-
- src: ${path}/bin/databend-meta
18+
- src: distro/bin/databend-meta
1919
dst: /usr/bin/databend-meta
20-
- src: ${path}/bin/databend-metactl
20+
- src: distro/bin/databend-metactl
2121
dst: /usr/bin/databend-metactl
2222

2323
# Configs
24-
- src: ${path}/configs/databend-meta.toml
24+
- src: distro/configs/databend-meta.toml
2525
dst: /etc/databend/databend-meta.toml
2626
type: config
2727

2828
# Systemd
29-
- src: ${path}/systemd/databend-meta.service
29+
- src: distro/systemd/databend-meta.service
3030
dst: /lib/systemd/system/databend-meta.service
31-
- src: ${path}/systemd/databend-meta.default
31+
- src: distro/systemd/databend-meta.default
3232
dst: /etc/default/databend-meta
3333

3434
- dst: /var/lib/databend
@@ -41,5 +41,5 @@ contents:
4141
mode: 0755
4242

4343
scripts:
44-
preinstall: ${path}/scripts/preinstall.sh
45-
postinstall: ${path}/scripts/postinstall.sh
44+
preinstall: distro/scripts/preinstall.sh
45+
postinstall: distro/scripts/postinstall.sh

‎scripts/distribution/nfpm-query-dbg.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "databend-query-dbg"
2-
arch: "${deb_arch}"
2+
arch: "${arch}"
33
platform: "linux"
4-
version: "${deb_version}"
4+
version: "${version}"
55
section: "database"
66
priority: "extra"
77
maintainer: "Databend Labs <[email protected]>"
@@ -14,5 +14,5 @@ depends:
1414
- databend-query
1515
contents:
1616
# Binaries
17-
- src: ${path}/bin/databend-query.debug
17+
- src: distro/bin/databend-query.debug
1818
dst: /usr/bin/databend-query.debug

‎scripts/distribution/nfpm-query.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "databend-query"
2-
arch: "${deb_arch}"
2+
arch: "${arch}"
33
platform: "linux"
4-
version: "${deb_version}"
4+
version: "${version}"
55
section: "database"
66
priority: "extra"
77
maintainer: "Databend Labs <[email protected]>"
@@ -15,22 +15,22 @@ depends:
1515
- libc6 (>= 2.31)
1616
contents:
1717
# Binaries
18-
- src: ${path}/bin/databend-query
18+
- src: distro/bin/databend-query
1919
dst: /usr/bin/databend-query
2020

2121
# Configs
22-
- src: ${path}/configs/databend-query.toml
22+
- src: distro/configs/databend-query.toml
2323
dst: /etc/databend/databend-query.toml
2424
type: config
2525

2626
# Systemd
27-
- src: ${path}/systemd/databend-query.service
27+
- src: distro/systemd/databend-query.service
2828
dst: /lib/systemd/system/databend-query.service
29-
- src: ${path}/systemd/databend-query.default
29+
- src: distro/systemd/databend-query.default
3030
dst: /etc/default/databend-query
3131

3232
# Docs
33-
- src: ${path}/readme.txt
33+
- src: distro/readme.txt
3434
dst: /usr/share/doc/databend/readme.txt
3535
file_info:
3636
mode: 0644
@@ -45,5 +45,5 @@ contents:
4545
mode: 0755
4646

4747
scripts:
48-
preinstall: ${path}/scripts/preinstall.sh
49-
postinstall: ${path}/scripts/postinstall.sh
48+
preinstall: distro/scripts/preinstall.sh
49+
postinstall: distro/scripts/postinstall.sh

0 commit comments

Comments
 (0)