Update circleci

paolostivanin · Mar 8, 2024 · 79e4dca · 79e4dca
1 parent 656ec79
commit 79e4dca
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,21 +1,12 @@
 version: 2.0
 
 jobs:
-  ubuntu2404:
-    docker:
-      - image: ubuntu:24.04
-    steps:
-      - checkout
-      - run: apt update && DEBIAN_FRONTEND=noninteractive apt -y install git gcc clang cmake libgcrypt20-dev libgtk-3-dev libzip-dev libjansson-dev libpng-dev libzbar-dev libprotobuf-c-dev libsecret-1-dev uuid-dev libprotobuf-dev libqrencode-dev
-      - run: chmod +x .ci/install_deps.sh && .ci/install_deps.sh
-      - run: chmod +x .ci/install_otpclient.sh && .ci/install_otpclient.sh
-
-  ubuntuLatestRolling:
+  archlinux:
     docker:
-      - image: ubuntu:rolling
+      - image: archlinux:latest
     steps:
       - checkout
-      - run: apt update && DEBIAN_FRONTEND=noninteractive apt -y install git gcc clang cmake libgcrypt20-dev libgtk-3-dev libzip-dev libjansson-dev libpng-dev libzbar-dev libprotobuf-c-dev libsecret-1-dev uuid-dev libprotobuf-dev libqrencode-dev
+      - run: pacman -Syu --noconfirm && pacman -S --noconfirm pkg-config git gtk3 libgcrypt zbar gcc clang cmake make libzip jansson libpng protobuf-c libsecret util-linux-libs qrencode
       - run: chmod +x .ci/install_deps.sh && .ci/install_deps.sh
       - run: chmod +x .ci/install_otpclient.sh && .ci/install_otpclient.sh
 
@@ -37,21 +28,20 @@ jobs:
       - run: chmod +x .ci/install_deps.sh && .ci/install_deps.sh
       - run: chmod +x .ci/install_otpclient.sh && .ci/install_otpclient.sh
 
-  archlinux:
+  ubuntu2404:
     docker:
-      - image: archlinux:latest
+      - image: ubuntu:24.04
     steps:
       - checkout
-      - run: pacman -Syu --noconfirm && pacman -S --noconfirm pkg-config git gtk3 libgcrypt zbar gcc clang cmake make libzip jansson libpng protobuf-c libsecret util-linux-libs qrencode
+      - run: apt update && DEBIAN_FRONTEND=noninteractive apt -y install git gcc clang cmake libgcrypt20-dev libgtk-3-dev libzip-dev libjansson-dev libpng-dev libzbar-dev libprotobuf-c-dev libsecret-1-dev uuid-dev libprotobuf-dev libqrencode-dev
       - run: chmod +x .ci/install_deps.sh && .ci/install_deps.sh
       - run: chmod +x .ci/install_otpclient.sh && .ci/install_otpclient.sh
 
 workflows:
   version: 2
   build:
     jobs:
-      - ubuntu2404
-      - ubuntuLatestRolling
+      - archlinux
       - debianLatestStable
       - fedoraLatestStable
-      - archlinux
+      - ubuntu2404