From 144be7e9eb7ed2b14e06dbe430fb93125c90c038 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 12:30:08 +0200 Subject: [PATCH 1/5] [ci] working on first version of builder --- .github/workflows/build.yaml | 41 ++++++++++++++++++++++++++++++++++ rascal-textmate.code-workspace | 3 +++ 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..e3e8287 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,41 @@ +name: Build and Deploy +on: + push: + branches: + - main + tags: + - 'v[0-9]+.*' + pull_request: + branches: + - main + +permissions: + actions: read + contents: write + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: 11 + distribution: 'temurin' + cache: 'maven' + - name: run-tests + working-directory: rascal-textmate-core + run: mvn test -B -Drascal.compile.skip -Drascal.tutor.skip + + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: 11 + distribution: 'temurin' + cache: 'maven' + - name: check + working-directory: rascal-textmate-core + run: mvn compile diff --git a/rascal-textmate.code-workspace b/rascal-textmate.code-workspace index a9e5a03..d629b71 100644 --- a/rascal-textmate.code-workspace +++ b/rascal-textmate.code-workspace @@ -5,6 +5,9 @@ }, { "path": "vscode-extension" + }, + { + "path": ".github" } ], "settings": { From 89d794a59858bc20b3d3b702609a37bebc2f920b Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 12:37:16 +0200 Subject: [PATCH 2/5] Update to latest released poms --- .github/workflows/build.yaml | 2 +- rascal-textmate-core/pom.xml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e3e8287..894e2c1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,4 +38,4 @@ jobs: cache: 'maven' - name: check working-directory: rascal-textmate-core - run: mvn compile + run: mvn -B compile diff --git a/rascal-textmate-core/pom.xml b/rascal-textmate-core/pom.xml index 8a68220..1fd0f3e 100644 --- a/rascal-textmate-core/pom.xml +++ b/rascal-textmate-core/pom.xml @@ -55,7 +55,7 @@ org.rascalmpl rascal-maven-plugin - 0.8.2 + 0.22.0 true ${project.build.outputDirectory} @@ -63,6 +63,15 @@ ${project.basedir}/src/main/rascal + + + it-compile + compile + + compile + + + From 196be06b2459375a79e46b9a9e46ab7ceec89122 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 12:46:51 +0200 Subject: [PATCH 3/5] Switching to latest version of rascal and maven plugin --- rascal-textmate-core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rascal-textmate-core/pom.xml b/rascal-textmate-core/pom.xml index 1fd0f3e..b41bd2d 100644 --- a/rascal-textmate-core/pom.xml +++ b/rascal-textmate-core/pom.xml @@ -29,7 +29,7 @@ org.rascalmpl rascal - 0.34.1 + 0.40.4 @@ -55,7 +55,7 @@ org.rascalmpl rascal-maven-plugin - 0.22.0 + 0.27.5 true ${project.build.outputDirectory} From 802fa21df73a9209d20981282cc550943804dd37 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 12:51:46 +0200 Subject: [PATCH 4/5] Making sure the right versions of plugins are used at CI --- rascal-textmate-core/pom.xml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/rascal-textmate-core/pom.xml b/rascal-textmate-core/pom.xml index b41bd2d..035c0d6 100644 --- a/rascal-textmate-core/pom.xml +++ b/rascal-textmate-core/pom.xml @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.13.0 -parameters 11 @@ -73,6 +73,26 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-maven + + enforce + + + + + 3.8.2 + + + + + + From 3519a5db04eb723207a98d4b2ed8b71170a4941b Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 9 Jul 2024 12:55:56 +0200 Subject: [PATCH 5/5] Make sure proper version of surefire is used --- rascal-textmate-core/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rascal-textmate-core/pom.xml b/rascal-textmate-core/pom.xml index 035c0d6..f340b2f 100644 --- a/rascal-textmate-core/pom.xml +++ b/rascal-textmate-core/pom.xml @@ -93,6 +93,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.3.0 +