CI: remove references to persisting

We don't use it anyways
v1993 · Jan 19, 2022 · ddd76af · ddd76af
1 parent dbdbf0e
commit ddd76af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.circleci/build-and-package.sh b/.circleci/build-and-package.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 set -e
 
-mkdir /tmp/persist
-mkdir /tmp/persist/artifacts
+mkdir /tmp/artifacts
 
 echo "Compiling and installing"
 
-meson --buildtype=release -Db_lto=true --prefix=/tmp/prefix /tmp/persist/build
-ninja -C /tmp/persist/build -j4
-ninja -C /tmp/persist/build install
+meson --buildtype=release -Db_lto=true --prefix=/tmp/prefix /tmp/build
+ninja -C /tmp/build -j4
+ninja -C /tmp/build install
 
 echo "Creating bundle"
 
-tar -pcvz --transform 's,^,linuxmotehook2/,' --transform 's,/tmp/prefix,,' -f  /tmp/persist/artifacts/linuxmotehook2-amd64.tar.gz \
+tar -pcvz --transform 's,^,linuxmotehook2/,' --transform 's,/tmp/prefix,,' -f  /tmp/artifacts/linuxmotehook2-amd64.tar.gz \
 /tmp/prefix \
 README.md LICENSE
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,18 +48,15 @@ jobs:
           steps:
             - run:
                 name: Publishing to testing PPA
-                command: './.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2-testing" "$(meson introspect /tmp/persist/build --projectinfo | jq -r .version)+ci${CI_PIPELINE_NUMBER}" "New upstream commit"'
+                command: './.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2-testing" "$(meson introspect /tmp/build --projectinfo | jq -r .version)+ci${CI_PIPELINE_NUMBER}" "New upstream commit"'
       - when:
           condition: << pipeline.git.tag >>
           steps:
             - run:
                 name: Publishing to release PPA
-                command: './.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2" "$(meson introspect /tmp/persist/build --projectinfo | jq -r .version)" "New upstream release"'
+                command: './.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2" "$(meson introspect /tmp/build --projectinfo | jq -r .version)" "New upstream release"'
       - store_artifacts:
-          path: /tmp/persist/artifacts
-      - persist_to_workspace:
-          root: /tmp/persist
-          paths: './*'
+          path: /tmp/artifacts
   build-rolling:
     docker:
       - image: "ubuntu:rolling"
@@ -108,15 +105,15 @@ jobs:
           steps:
             - run:
                 name: Publishing to testing PPA
-                command: '[[ $(ubuntu-distro-info -s) == $(lsb_release -c) ]] || ./.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2-testing" "$(meson introspect /tmp/persist/build --projectinfo | jq -r .version)+ci${CI_PIPELINE_NUMBER}" "New upstream commit"'
+                command: '[[ $(ubuntu-distro-info -s) == $(lsb_release -c) ]] || ./.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2-testing" "$(meson introspect /tmp/build --projectinfo | jq -r .version)+ci${CI_PIPELINE_NUMBER}" "New upstream commit"'
       - when:
           condition: << pipeline.git.tag >>
           steps:
             - run:
                 name: Publishing to release PPA
-                command: '[[ $(ubuntu-distro-info -s) == $(lsb_release -c) ]] || ./.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2" "$(meson introspect /tmp/persist/build --projectinfo | jq -r .version)" "New upstream release"'
+                command: '[[ $(ubuntu-distro-info -s) == $(lsb_release -c) ]] || ./.circleci/ppa-publish.sh "ppa:v19930312/linuxmotehook2" "$(meson introspect /tmp/build --projectinfo | jq -r .version)" "New upstream release"'
       - store_artifacts:
-          path: /tmp/persist/artifacts
+          path: /tmp/artifacts
 
 workflows:
   version: 2