Skip to content

Commit 5f78a5e

Browse files
authored
Merge pull request #49 from clj-commons/slipset-patch-update-build
Update CI/CD to not need local maybe-deploy
2 parents e9205ae + 90ceb5f commit 5f78a5e

File tree

2 files changed

+41
-24
lines changed

2 files changed

+41
-24
lines changed

.circleci/config.yml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ version: 2.1
77
workflows:
88
build-deploy:
99
jobs:
10-
- build
10+
- build:
11+
filters:
12+
tags:
13+
only: /.*/
1114

1215
- deploy:
1316
requires:
1417
- build
18+
filters:
19+
tags:
20+
only: /Release-.*/
1521
context:
1622
- CLOJARS_DEPLOY
23+
1724
jobs:
1825
build:
1926
docker:
@@ -73,6 +80,13 @@ jobs:
7380
steps:
7481
- checkout
7582

83+
# Download and cache dependencies
84+
- restore_cache:
85+
keys:
86+
- v1-dependencies-{{ checksum "project.clj" }}
87+
# fallback to using the latest cache if no exact match is found
88+
- v1-dependencies-
89+
7690
# Download and cache dependencies
7791
- restore_cache:
7892
keys:
@@ -82,13 +96,36 @@ jobs:
8296

8397
- run:
8498
name: Install babashka
85-
command: bash <(curl -s https://raw.githubusercontent.com/borkdude/babashka/master/install) --dir . --download-dir .
86-
- run: lein with-profile ci deps
99+
command: |
100+
curl -s https://raw.githubusercontent.com/borkdude/babashka/master/install -o install.sh
101+
sudo bash install.sh
102+
rm install.sh
103+
- run:
104+
name: Install deployment-script
105+
command: |
106+
curl -s https://raw.githubusercontent.com/clj-commons/infra/main/deployment/circle-maybe-deploy.bb -o circle-maybe-deploy.bb
107+
chmod a+x circle-maybe-deploy.bb
108+
- run: lein deps
87109

110+
- run:
111+
name: Setup GPG signing key
112+
command: |
113+
GNUPGHOME="$HOME/.gnupg"
114+
export GNUPGHOME
115+
mkdir -p "$GNUPGHOME"
116+
chmod 0700 "$GNUPGHOME"
117+
echo "$GPG_KEY" \
118+
| base64 --decode --ignore-garbage \
119+
| gpg --batch --allow-secret-key-import --import
120+
gpg --keyid-format LONG --list-secret-keys
88121
- save_cache:
89122
paths:
90123
- ~/.m2
91124
key: v1-dependencies-{{ checksum "project.clj" }}
92125
- run:
93126
name: Deploy
94-
command: .circleci/maybe-deploy.bb lein with-profile ci deploy clojars
127+
command: |
128+
GPG_TTY=$(tty)
129+
export GPG_TTY
130+
echo $GPG_TTY
131+
./circle-maybe-deploy.bb lein with-profile ci deploy clojars

.circleci/maybe-deploy.bb

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)