Skip to content

Commit ffd86c6

Browse files
committed
aggregate parameter in CI strategy
gradlw clean is only executed in publishM2 publishM2 is now configured properly
1 parent 8d91bbe commit ffd86c6

File tree

5 files changed

+15
-22
lines changed

5 files changed

+15
-22
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
needs: vars
1919
runs-on: ubuntu-latest
2020

21-
strategy:
21+
strategy: &scala_strategy
2222
max-parallel: 2
2323
fail-fast: false
2424
matrix:
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
java-version: 17
3333
- name: Compile
34-
run: ./dev/make-all.sh -PscalaVersion=${{matrix.scalaVersion}}
34+
run: ./dev/publishM2.sh -PscalaVersion=${{matrix.scalaVersion}}
3535

3636
- name: Pre-release on github
3737
uses: "marvinpinto/action-automatic-releases@latest"
@@ -50,11 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151

5252
#TODO: don't repeat yourself
53-
strategy:
54-
max-parallel: 2
55-
fail-fast: false
56-
matrix:
57-
scalaVersion: ["2.13.9", "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14", "2.13.15", "2.13.16", "2.13.17", "2.13.18"]
53+
strategy: *scala_strategy
5854

5955
continue-on-error: ${{ contains(needs.vars.outputs.experimentalScalaVersions, matrix.scalaVersion) }}
6056

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,4 @@ foo
6262
**/rootkey.csv
6363

6464
#publish
65-
dev/publish.sh
66-
dev/publishM2.sh
65+
dev/publish.sh

dev/make-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ mkdir -p ${FWDIR}/logs/dependencyTree
1111

1212
${FWDIR}/gradlew -q dependencyTree "${@}" > ${FWDIR}/logs/dependencyTree/"$DATE".log
1313

14-
${FWDIR}/gradlew clean assemble testClasses publishToMavenLocal "${@}"
14+
${FWDIR}/gradlew testClasses assemble "${@}"

dev/publishM2.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
CRDIR="$(
4+
cd "$(dirname "$0")" || exit
5+
pwd
6+
)"
7+
8+
echo "[COMPILING]" && \
9+
"${CRDIR}"/../gradlew clean && \
10+
"${CRDIR}"/make-all.sh publishToMavenLocal "${@}"

dev/publishM2.template.sh

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

0 commit comments

Comments
 (0)