Skip to content

Commit

Permalink
chore: upgrade pipeline tests to JHipster 8, Java 17, and Node.js 18/20
Browse files Browse the repository at this point in the history
closes #609
  • Loading branch information
jtkiesel committed Oct 29, 2023
1 parent a7f9a5f commit 09b9dc6
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 31 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/github-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ jobs:
strategy:
matrix:
node_version:
- 14.x
- 16.x
- 18.x
- 20.x
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
java-version: '11.x'
java-version: 17.x
distribution: zulu
- name: Install dependencies
run: yarn
- name: Run CI
Expand All @@ -33,15 +33,16 @@ jobs:
test_repository:
- e2e-jhipster1
- e2e-jhipster2
node_version: [14.x]
node_version: [18.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
java-version: '11.x'
java-version: 17.x
distribution: zulu
- name: Install dependencies
run: yarn
- name: Build prettier-plugin-java
Expand Down
8 changes: 4 additions & 4 deletions packages/java-parser/scripts/clone-samples.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ const samplesDir = path.resolve(__dirname, "../samples");
const sampleRepos = [
{
repoUrl: "https://github.com/iluwatar/java-design-patterns.git",
branch: "1.20.0"
branch: "1.25.0"
},
{
repoUrl: "https://github.com/spring-projects/spring-boot.git",
branch: "v2.1.0.RELEASE"
branch: "v3.1.5"
},
{
repoUrl: "https://github.com/google/guava.git",
branch: "v27.0.1"
branch: "v32.1.3"
},
{
repoUrl: "https://github.com/spring-projects/spring-framework.git",
branch: "v5.1.5.RELEASE"
branch: "v6.0.13"
},
{
repoUrl: "https://github.com/jhipster/jhipster",
Expand Down
26 changes: 13 additions & 13 deletions packages/prettier-plugin-java/scripts/clone-samples.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,65 +9,65 @@ const samplesDir = path.resolve(__dirname, "../samples");
const core = [
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster",
branch: "main"
},
{
repoUrl: "https://github.com/spring-projects/spring-boot.git",
branch: "v2.1.0.RELEASE"
branch: "v3.1.5"
},
{
repoUrl: "https://github.com/iluwatar/java-design-patterns.git",
branch: "1.20.0"
branch: "1.25.0"
}
];

const jhipster1 = [
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-microservice",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-oauth2",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-websocket",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-noi18n",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-hazelcast",
branch: "v7.9.3"
branch: "main"
}
];

const jhipster2 = [
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-elasticsearch",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-mongodb",
branch: "v7.9.3"
branch: "main"
},
{
repoUrl: "https://github.com/jhipster/jhipster-sample-app-react",
branch: "v7.9.3"
branch: "main"
}
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ describe("prettier-java", () => {

testRepositorySample(
resolve(__dirname, "../../samples/spring-boot"),
"./mvnw",
["clean", "install", "-Ddisable.checks", "-DskipTests"]
"./gradlew",
["clean", "build", "-Ddisable.checks", "-xtest", "--no-scan"]
);

jhipsterRepository.forEach(repository => {
Expand Down
3 changes: 2 additions & 1 deletion packages/prettier-plugin-java/test/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ export function testRepositorySample(
});
if (code.status !== 0) {
expect.fail(
`Cannot build ${testFolder}, please check the output below:\n ${code.stdout.toString()}`
`Cannot build ${testFolder}, please check the output below:\n` +
code.error ?? code.stderr
);
}
});
Expand Down

0 comments on commit 09b9dc6

Please sign in to comment.