Compare commits

...

17 commits

Author SHA1 Message Date
Michiel Borkent
4ac03c4319 binaries artifacts 2022-06-07 21:26:19 +02:00
Michiel Borkent
6adab58739 rosetta 2022-06-07 21:18:56 +02:00
Michiel Borkent
da115179b4 rosetta 2022-06-07 21:17:24 +02:00
Michiel Borkent
9b56301524 github token 2022-06-07 21:16:19 +02:00
Michiel Borkent
a2b88db8bf All config 2022-06-07 21:09:34 +02:00
Michiel Borkent
03b84c9657 wip 2022-06-07 21:02:46 +02:00
Michiel Borkent
c0180071cf cirrus 2022-06-07 21:00:42 +02:00
Michiel Borkent
6ccb641210 config 2022-06-07 20:56:16 +02:00
Michiel Borkent
e5eb071bc9 sudo 2022-06-07 20:54:33 +02:00
Michiel Borkent
c2fd566b18 build bin 2022-06-07 20:53:37 +02:00
Michiel Borkent
30f3c1e40e config 2022-06-07 20:50:54 +02:00
Michiel Borkent
a480489947 disable circle 2022-06-07 20:45:28 +02:00
Michiel Borkent
1b015148e8 hmm 2022-06-07 20:41:20 +02:00
Michiel Borkent
5cc948e951 hmm 2022-06-07 20:40:35 +02:00
Michiel Borkent
c8c401473a hmm 2022-06-07 20:39:52 +02:00
Michiel Borkent
dbb4fef030 config 2022-06-07 20:34:32 +02:00
Michiel Borkent
5fb0c82c0e try 2022-06-07 20:33:39 +02:00
3 changed files with 73 additions and 38 deletions

View file

@ -7,4 +7,5 @@
:git/sha "1ce87f4960fea14f4d1248052e585e6027555d33"}} :git/sha "1ce87f4960fea14f4d1248052e585e6027555d33"}}
:tasks {:requires ([scripts.short-ci :as short]) :tasks {:requires ([scripts.short-ci :as short])
release-artifact babashka.release-artifact/release release-artifact babashka.release-artifact/release
short-ci {:task (do (alter-var-root (var short/config) assoc :skip-if-only (re-pattern ".*")))}}} short-ci {:task (do (alter-var-root (var short/config) assoc :skip-if-only [(re-pattern ".*")])
(apply short/main *command-line-args*))}}}

View file

@ -28,7 +28,9 @@ jobs:
command: mv /tmp/bb /tmp/bbb command: mv /tmp/bb /tmp/bbb
- run: - run:
name: Short CI if only irrelevant changes name: Short CI if only irrelevant changes
command: /tmp/bbb --config .build/bb.edn short-ci "circleci task halt" command: |
/tmp/bbb --config .build/bb.edn short-ci "circleci-agent step halt"
circleci-agent step halt
jvm: jvm:
docker: docker:
- image: circleci/clojure:openjdk-11-lein-2.9.8-bullseye - image: circleci/clojure:openjdk-11-lein-2.9.8-bullseye
@ -484,38 +486,38 @@ workflows:
version: 2 version: 2
ci: ci:
jobs: jobs:
- short-if-irrelevant # - short-if-irrelevant
- jvm: # - jvm:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- linux: # - linux:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- linux-static: # - linux-static:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- mac: # - mac:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- linux-aarch64: # - linux-aarch64:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- linux-aarch64-static: # - linux-aarch64-static:
requires: # requires:
- short-if-irrelevant # - short-if-irrelevant
- deploy: # - deploy:
filters: # filters:
branches: # branches:
only: master # only: master
requires: # requires:
- jvm # - jvm
- linux # - linux
# - mac # TODO: Enable when not needed from Actions # # - mac # TODO: Enable when not needed from Actions
- docker: # - docker:
filters: # filters:
branches: # branches:
only: master # only: master
requires: # requires:
- linux # - linux
- linux-static # - linux-static
- linux-aarch64 # - linux-aarch64

View file

@ -2,4 +2,36 @@ macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest image: ghcr.io/cirruslabs/macos-monterey-base:latest
task: task:
script: echo "Hello World from macOS!" env:
LEIN_ROOT: "true"
GRAALVM_VERSION: "22.1.0"
GRAALVM_HOME: ${HOME}/graalvm-ce-java11-22.1.0/Contents/Home
BABASHKA_PLATFORM: macos # used in release script
BABASHKA_ARCH: aarch64
BABASHKA_TEST_ENV: native
BABASHKA_XMX: "-J-Xmx6500m"
script: |
git submodule init
git submodule update
sudo script/install-clojure
sudo script/install-leiningen
script/install-graalvm
export PATH=$GRAALVM_HOME/bin:$PATH
sudo /usr/sbin/softwareupdate --install-rosetta --agree-to-license
java -version
script/uberjar
script/compile
script/test
script/run_lib_tests
VERSION=$(cat resources/BABASHKA_VERSION)
arch=${BABASHKA_ARCH:-amd64}
archive="babashka-$VERSION-$BABASHKA_PLATFORM-$arch.tar.gz"
tar zcvf "$archive" bb
export GITHUB_TOKEN=ENCRYPTED[d6ff8cdc392157f211c754fa0763875434d1bfde0c00a05e48ba9470003a76c14c9213adb80623f81e13f2f0fa8fbd57]
./bb --config .build/bb.edn --deps-root . release-artifact "/tmp/release/$archive" || true
binaries_artifacts:
path: "./bb"