Merge pull request #1032 from nzlosh/add_jammy

Add Ubuntu Jammy to package build/deploy
StackStorm · Jan 21, 2025 · be6b339 · be6b339
2 parents a4e2cb7 + 5049463
commit be6b339
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,7 @@ jobs:
       image: ubuntu-2204:2023.04.2
     environment:
       DEPLOY_PACKAGES: 1
-      DEB: focal
+      DEB: focal jammy
       RPM: el8 el9
       ST2_VERSION: "3.9dev"
       ST2_HOST: localhost
@@ -44,9 +44,10 @@ jobs:
       - run:
           name: Export package version
           command: |
+            export DISTROS=( $DEB $RPM )
             PKG_VERSION=$(node -e "console.log(require('./package.json').st2_version);")
             if [ -n "$PACKAGECLOUD_TOKEN" ]; then
-              PKG_RELEASE=$(packagecloud.sh next-revision bionic ${PKG_VERSION} st2web)
+              PKG_RELEASE=$(packagecloud.sh next-revision ${DISTROS[0]} ${PKG_VERSION} st2web)
             else
               # is fork
               PKG_RELEASE=1
@@ -131,29 +132,35 @@ jobs:
           command: |
             nvm use 20.8.1
             make deb
-            echo $DEB | tr ' ' '\n' | xargs -I{} cp -vr ../st2web_*.{deb,changes} ~/artifacts/{}
+            for i in $DEB
+            do
+              cp -vr ../st2web_*.{deb,changes} ~/artifacts/"${i}"
+            done
       - run:
           name: Make RPM packages
           command: |
             nvm use 20.8.1
             make rpm
-            echo $RPM | tr ' ' '\n' | xargs -I{} cp -vr ../st2web-*.rpm ~/artifacts/{}
+            for i in $RPM
+            do
+              cp -vr ../st2web-*.rpm ~/artifacts/"${i}"
+            done
       - store_artifacts:
           path: ~/artifacts
           destination: packages
       - persist_to_workspace:
           root: /home/circleci/artifacts
           paths:
-            - bionic
             - focal
-            - el7
+            - jammy
             - el8
+            - el9
   deploy:
     docker:
       - image: ruby:2.7
     environment:
       ARTIFACTS: /home/circleci/artifacts
-      DISTROS: focal el8 el9
+      DISTROS: focal jammy el8 el9
     steps:
       - checkout
       - attach_workspace: