Skip to content

Commit 8a7aa8f

Browse files
committed
fix: use apt-get instead of sdkman
1 parent b86af3f commit 8a7aa8f

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.circleci/config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ commands:
160160
- sdkman-archive-cache-v3-{{ arch }}-{{ checksum ".circleci/install-sdks-unix.sh" }}
161161
- run:
162162
name: Installing SDKs
163-
command: ./.circleci/install-sdks-unix.sh
163+
command: sudo ./.circleci/install-sdks-unix.sh
164164
- save_cache:
165165
name: Saving SDKMAN archive cache
166166
key: sdkman-archive-cache-v3-{{ arch }}-{{ checksum ".circleci/install-sdks-unix.sh" }}
@@ -181,8 +181,9 @@ commands:
181181
- run:
182182
name: Installing golang
183183
command: |
184-
brew install go gradle python elixir composer
185-
- install_sdks_unix
184+
brew install go gradle python elixir composer gradle@6 maven sbt
185+
- aws-cli/install:
186+
version: << pipeline.parameters.aws_version >>
186187
install_shellspec_dependencies:
187188
steps:
188189
- run:

.circleci/install-sdks-unix.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22
# Can't set -u as sdkman has unbound variables.
33
set -eo pipefail
44

5-
sdk install java 11.0.17-tem
6-
sdk install maven 3.8.2
7-
sdk install gradle 6.8.3
8-
sdk install sbt 1.5.5
5+
apt-get install -y \
6+
maven \
7+
gradle \
8+
openjdk-11-jdk-headless \
9+
openjdk-11-jre-headless \
10+
11+
echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
12+
echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
13+
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import
14+
chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg
15+
apt-get update
16+
apt-get install sbt

cliv2/scripts/sign_windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ osslsigncode sign -h sha512 \
2626
-pass "$SIGNING_SECRETS_PASSWORD" \
2727
-n "Snyk CLI" \
2828
-i "https://snyk.io" \
29-
-t "http://timestamp.comodoca.com/authenticode" \
29+
-t "http://timestamp.sectigo.com" \
3030
-in "$APP_PATH_UNSIGNED" \
3131
-out "$APP_PATH"
3232

0 commit comments

Comments
 (0)