Skip to content

Commit 8ca8585

Browse files
committed
ci: fix sonatype publish
1 parent 72533fa commit 8ca8585

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,9 @@ jobs:
177177
- name: Build and Publish to Sonatype
178178
env:
179179
SONATYPE_SECRET: .secrets/credentials.sonatype-nexus.properties
180-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
181-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
182-
CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
183180
CI_BRANCH: ${{ github.ref_name }}
184181
CI_BRANCH_TAG: ${{ github.ref_name }}
182+
CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
185183
run: |
186184
mkdir .secrets
187185
echo "$SONATYPE_CREDENTIALS_FILE" > "$SONATYPE_SECRET"

.mdl/defs/actions.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
- `USER`
1010
- `OPENSSL_IV`
1111
- `OPENSSL_KEY`
12-
- `SONATYPE_USERNAME`
13-
- `SONATYPE_PASSWORD`
12+
- `SONATYPE_SECRET`
1413
- `NODE_AUTH_TOKEN`
14+
- `CI_BRANCH`
1515
- `CI_BRANCH_TAG`
1616
- `CI_PULL_REQUEST`
17-
- `CI_BRANCH`
1817

1918
# Axis
2019
- `platform`=`{jvm*|js|js-nojvm}`
@@ -306,22 +305,10 @@ JAVA_OPTIONS="${action.setup-jvm-options.java-options}"
306305
_JAVA_OPTIONS="$JAVA_OPTIONS"
307306
VERSION_COMMAND="${action.setup-scala.version-command}"
308307

309-
SONATYPE_USERNAME_VAL="${env.SONATYPE_USERNAME}"
310-
SONATYPE_PASSWORD_VAL="${env.SONATYPE_PASSWORD}"
311308
CI_PULL_REQUEST_VAL="${env.CI_PULL_REQUEST}"
312309
CI_BRANCH_VAL="${env.CI_BRANCH}"
313310
CI_BRANCH_TAG_VAL="${env.CI_BRANCH_TAG}"
314311

315-
if [[ -z "$SONATYPE_USERNAME_VAL" ]]; then
316-
echo "Missing SONATYPE_USERNAME, skipping publish"
317-
exit 0
318-
fi
319-
320-
if [[ -z "$SONATYPE_PASSWORD_VAL" ]]; then
321-
echo "Missing SONATYPE_PASSWORD, skipping publish"
322-
exit 0
323-
fi
324-
325312
if [[ "$CI_PULL_REQUEST_VAL" == "true" ]]; then
326313
echo "Publishing not allowed on pull requests"
327314
exit 0
@@ -332,9 +319,10 @@ if [[ "$CI_BRANCH_VAL" != "develop" && ! "$CI_BRANCH_TAG_VAL" =~ ^v ]]; then
332319
exit 0
333320
fi
334321

335-
CREDENTIALS_FILE="${sys.project-root}/.secrets/credentials.sonatype-nexus.properties"
336-
mkdir -p "$(dirname "$CREDENTIALS_FILE")"
337-
printf "%s\n" "realm=Sonatype Nexus Repository Manager" "host=central.sonatype.com" "user=${SONATYPE_USERNAME_VAL}" "password=${SONATYPE_PASSWORD_VAL}" > "$CREDENTIALS_FILE"
322+
if [[ ! -f "$SONATYPE_SECRET" ]] ; then
323+
echo "SONATYPE_SECRET=$SONATYPE_SECRET is not a file, failing publish"
324+
exit 1
325+
fi
338326

339327
if [[ "$CI_BRANCH_TAG_VAL" =~ ^v.*$ ]]; then
340328
sbt -batch -no-colors -v \

0 commit comments

Comments
 (0)