Skip to content

Commit be6b339

Browse files
authored
Merge pull request #1032 from nzlosh/add_jammy
Add Ubuntu Jammy to package build/deploy
2 parents a4e2cb7 + 5049463 commit be6b339

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

.circleci/config.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
image: ubuntu-2204:2023.04.2
1313
environment:
1414
DEPLOY_PACKAGES: 1
15-
DEB: focal
15+
DEB: focal jammy
1616
RPM: el8 el9
1717
ST2_VERSION: "3.9dev"
1818
ST2_HOST: localhost
@@ -44,9 +44,10 @@ jobs:
4444
- run:
4545
name: Export package version
4646
command: |
47+
export DISTROS=( $DEB $RPM )
4748
PKG_VERSION=$(node -e "console.log(require('./package.json').st2_version);")
4849
if [ -n "$PACKAGECLOUD_TOKEN" ]; then
49-
PKG_RELEASE=$(packagecloud.sh next-revision bionic ${PKG_VERSION} st2web)
50+
PKG_RELEASE=$(packagecloud.sh next-revision ${DISTROS[0]} ${PKG_VERSION} st2web)
5051
else
5152
# is fork
5253
PKG_RELEASE=1
@@ -131,29 +132,35 @@ jobs:
131132
command: |
132133
nvm use 20.8.1
133134
make deb
134-
echo $DEB | tr ' ' '\n' | xargs -I{} cp -vr ../st2web_*.{deb,changes} ~/artifacts/{}
135+
for i in $DEB
136+
do
137+
cp -vr ../st2web_*.{deb,changes} ~/artifacts/"${i}"
138+
done
135139
- run:
136140
name: Make RPM packages
137141
command: |
138142
nvm use 20.8.1
139143
make rpm
140-
echo $RPM | tr ' ' '\n' | xargs -I{} cp -vr ../st2web-*.rpm ~/artifacts/{}
144+
for i in $RPM
145+
do
146+
cp -vr ../st2web-*.rpm ~/artifacts/"${i}"
147+
done
141148
- store_artifacts:
142149
path: ~/artifacts
143150
destination: packages
144151
- persist_to_workspace:
145152
root: /home/circleci/artifacts
146153
paths:
147-
- bionic
148154
- focal
149-
- el7
155+
- jammy
150156
- el8
157+
- el9
151158
deploy:
152159
docker:
153160
- image: ruby:2.7
154161
environment:
155162
ARTIFACTS: /home/circleci/artifacts
156-
DISTROS: focal el8 el9
163+
DISTROS: focal jammy el8 el9
157164
steps:
158165
- checkout
159166
- attach_workspace:

0 commit comments

Comments
 (0)