Skip to content

Commit f4c640b

Browse files
authored
Merge pull request #285 from modelix/feature/adapt-to-recommended-gradle-action-setup
ci: use gradle-build-action for setting up Gradle
2 parents fb182c3 + f7cd103 commit f4c640b

File tree

3 files changed

+16
-31
lines changed

3 files changed

+16
-31
lines changed

.github/workflows/build.yaml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@ jobs:
2020
with:
2121
distribution: 'temurin'
2222
java-version: '11'
23-
- name: Build
23+
- name: Set up Gradle
2424
uses: gradle/gradle-build-action@v2
25+
- name: Build
2526
env:
2627
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
with:
28-
arguments: |
29-
--build-cache
30-
build
31-
detekt
32-
-PciBuild=true
28+
run: ./gradlew --build-cache build detekt -PciBuild=true
3329
- name: Archive test report
3430
uses: actions/upload-artifact@v3
3531
if: always()
@@ -41,7 +37,7 @@ jobs:
4137
# In theory, the upload action should take care of stripping the GitHub
4238
# runner workspace path from the file paths. But somehow that doesn't
4339
# work. So do it manually.
44-
- name: relativize SARIF file paths
40+
- name: Relativize SARIF file paths
4541
run: |
4642
sed -i 's#${{ github.workspace }}/##' build/reports/detekt/*.sarif
4743
- name: Upload SARIF file
@@ -59,16 +55,12 @@ jobs:
5955
with:
6056
distribution: 'temurin'
6157
java-version: '11'
62-
- name: Assemble
58+
- name: Set up Gradle
6359
uses: gradle/gradle-build-action@v2
60+
- name: Assemble
6461
env:
6562
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66-
with:
67-
arguments: |
68-
--build-cache
69-
assemble
70-
publishToMavenLocal
71-
-PciBuild=true
63+
run: ./gradlew --build-cache assemble publishToMavenLocal -PciBuild=true
7264
- name: Test Model API Generator Gradle Plugin
7365
env:
7466
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -83,17 +75,12 @@ jobs:
8375
with:
8476
distribution: 'temurin'
8577
java-version: '11'
86-
- name: Assemble
78+
- name: Set up Gradle
8779
uses: gradle/gradle-build-action@v2
80+
- name: Assemble
8881
env:
8982
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
90-
with:
91-
arguments: |
92-
--build-cache
93-
assemble
94-
publishToMavenLocal
95-
-PciBuild=true
96-
83+
run: ./gradlew --build-cache assemble publishToMavenLocal -PciBuild=true
9784
- name: Test Bulk Model Sync Gradle Plugin
9885
env:
9986
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/mps-compatibility.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ jobs:
3030
with:
3131
distribution: 'temurin'
3232
java-version: '17'
33-
- name: Build with ${{ matrix.version }}
33+
- name: Set up Gradle
3434
uses: gradle/gradle-build-action@v2
35-
with:
36-
arguments: |
37-
--build-cache
38-
:mps-model-adapters:build
39-
:mps-model-server-plugin:build
40-
-Pmps.version=${{ matrix.version }}
35+
- name: Build with ${{ matrix.version }}
36+
run: ./gradlew --build-cache :mps-model-adapters:build :mps-model-server-plugin:build -Pmps.version=${{ matrix.version }}

.github/workflows/publish.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ jobs:
2424
with:
2525
distribution: 'temurin'
2626
java-version: '11'
27+
- name: Set up Gradle
28+
uses: gradle/gradle-build-action@v2
2729
- name: Use tag as version
2830
run: echo "${GITHUB_REF#refs/*/}" > version.txt
2931
- name: Build and Publish Artifacts
30-
run: ./gradlew build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GITHUB_TOKEN }} -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
32+
run: ./gradlew --build-cache build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GITHUB_TOKEN }} -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
3133
env:
3234
NODE_AUTH_TOKEN: ${{ secrets.ARTIFACTS_ITEMIS_CLOUD_NPM_TOKEN }}
3335
- name: Set up QEMU

0 commit comments

Comments
 (0)