Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FixGitHub #47

Closed
wants to merge 3 commits into from
Closed

FixGitHub #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27e6a2b
Fix GitHub actions
hd42 Sep 5, 2022
2b19078
Add 2022-06 mirror
hd42 Sep 5, 2022
a331926
Use 8 instead of 1.8 for java version
hd42 Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/maven.yml
View file
Open in desktop
Expand Up @@ -6,11 +6,7 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
branches: [ FIPS-8557 ]
pull_request:
branches: [ FIPS-8557 ]
on: [push, pull_request]

jobs:
build:
Expand All @@ -20,10 +16,10 @@ jobs:
strategy:
fail-fast: false
matrix:
eclipse-release: ['2019-03', '2019-06', '2019-09', '2019-12', '2020-03', '2020-06', '2020-09', '2020-12', '2021-03', '2021-06', '2021-09', '2021-12', '2022-03']
eclipse-release: ['2020-03', '2020-06', '2020-09', '2020-12', '2021-03', '2021-06', '2021-09', '2021-12', '2022-03', '2022-06']

env:
integration-test-release: '2019-03'
integration-test-release: '2020-03'
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
Expand Down
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0</version>
<version>3.0.0-SNAPSHOT</version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.7.5 should be fine here as we do not need any snapshot features in the build extension here.

</extension>
</extensions>
2 changes: 1 addition & 1 deletion runtime/pom.xml
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
<maven-bundle-plugin.version>5.1.6</maven-bundle-plugin.version>
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
<!-- java and compiler options -->
<java.version>1.8</java.version>
<java.version>8</java.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does not work either :-(

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.8 should be fine, what is the problem with that?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was my attempt to fix the problem seen in https://github.com/faktorips/faktorips.base/actions/runs/3107664233/jobs/5036022637#step:8:4050:
Error: Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5:test (default-test) on project faktorips-valuetypes-joda: Requested toolchain specification did not match any configured toolchain: {version=1.8} -> [Help 1]

My understanding was that the actions/setup-java would set up the toolchain.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding was that the actions/setup-java would set up the toolchain.

Sadly not see actions/setup-java#276 I'll try to provide a workaround for this in #49

<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
Expand Down
7 changes: 7 additions & 0 deletions settings.xml
View file
Open in desktop
Expand Up @@ -109,6 +109,13 @@
<layout>p2</layout>
<mirrorOfLayouts>p2</mirrorOfLayouts>
</mirror>
<mirror>
<id>faktorzehn-2022-06</id>
<mirrorOf>https://update.faktorzehn.org/p2repositories/2022-06</mirrorOf>
<url>http://download.eclipse.org/releases/2022-06</url>
<layout>p2</layout>
<mirrorOfLayouts>p2</mirrorOfLayouts>
</mirror>

<!-- Babel -->
<mirror>
Expand Down