-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into addBukacekTest
- Loading branch information
Showing
739 changed files
with
28,572 additions
and
15,696 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| name: Publish package to the Maven Central Repository | ||
| on: | ||
| workflow_dispatch: | ||
| release: | ||
| types: [published] | ||
| jobs: | ||
| publish: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up Maven Central Repository | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '21' | ||
| distribution: 'temurin' | ||
| server-id: central | ||
| server-username: MAVEN_USERNAME | ||
| server-password: MAVEN_PASSWORD | ||
| gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} | ||
| gpg-passphrase: MAVEN_GPG_PASSPHRASE | ||
| - name: Set version | ||
| run: mvn versions:set -DnewVersion=${{ github.event.release.tag_name }} | ||
| - name: Publish package | ||
| run: mvn -P release --batch-mode deploy -DskipTests | ||
| env: | ||
| MAVEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }} | ||
| MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }} | ||
| MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSWORD }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Deploy Javadoc | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| release: | ||
| types: [published] | ||
|
|
||
| jobs: | ||
| publish: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write # if you have a protection rule on your repository, you'll need to give write permission to the workflow. | ||
| steps: | ||
| - name: Deploy JavaDoc 🚀 | ||
| uses: MathieuSoysal/[email protected] | ||
| with: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| javadoc-branch: javadoc | ||
| java-version: 17 | ||
| target-folder: javadoc # url will be https://equinor.github.io/neqsim/javadoc | ||
| project: maven |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,4 @@ | ||
| name: Create release (draft) | ||
| # Workflow is triggered when any pom-file is updated in master-branch | ||
| # If both pom-files have the same version number it | ||
| # - builds NeqSim-jars both in Java 8 and Java 11 | ||
| # - creates a new release and uploads the jars as artifacts | ||
| # - makes a new branch in neqsimpython and updates the jar-files used there. | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
@@ -26,7 +21,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Check out neqsim java project | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Get version number for pomJava8.xml | ||
| id: java-8 | ||
| uses: JActions/[email protected] | ||
|
|
@@ -50,9 +45,9 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Check out neqsim java project | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Set up JDK 8 environment | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '8' | ||
|
|
@@ -61,9 +56,9 @@ jobs: | |
| run: mvn -B package --file pomJava8.xml | ||
| - name: Copy jar file to staging | ||
| run: mkdir staging && cp target/neqsim*Java8.jar staging | ||
| - uses: actions/upload-artifact@v2 | ||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: jarfiles | ||
| name: jarfiles-java8 | ||
| path: staging | ||
|
|
||
| compile_java_11: | ||
|
|
@@ -75,9 +70,9 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Check out neqsim java project | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Set up JDK 11 environment | ||
| uses: actions/setup-java@v3 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '11' | ||
|
|
@@ -86,21 +81,56 @@ jobs: | |
| run: mvn -B package --file pom.xml | ||
| - name: Copy jar file to staging | ||
| run: mkdir staging && cp target/neqsim*.jar staging | ||
| - uses: actions/upload-artifact@v2 | ||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: jarfiles | ||
| name: jarfiles-java11 | ||
| path: staging | ||
|
|
||
|
|
||
| compile_java_21: | ||
| name: Build Neqsim ${{ needs.get_versions.outputs.version }} with java 21 | ||
| needs: get_versions | ||
|
|
||
| if: ${{ needs.get_versions.outputs.version_8 == needs.get_versions.outputs.version }} | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Check out neqsim java project | ||
| uses: actions/checkout@v4 | ||
| - name: Set up JDK 21 environment | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '21' | ||
| cache: 'maven' | ||
| - name: Build java 21 version with Maven | ||
| run: mvn -B package --file pomJava21.xml | ||
| - name: Rename files | ||
| run: cd target && find . -type f -name "neqsim-*.jar" -exec sh -c 'mv -f $0 ${0%.jar}-Java21.jar' {} \; && cd .. | ||
| - name: Copy jar file to staging | ||
| run: mkdir staging && cp target/neqsim*Java21.jar staging | ||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: jarfiles-java21 | ||
| path: staging | ||
|
|
||
| create_release: | ||
| name: Create release v${{ needs.get_versions.outputs.version_8 }} | ||
| runs-on: ubuntu-latest | ||
| needs: [get_versions, compile_java_8, compile_java_11] | ||
| needs: [get_versions, compile_java_8, compile_java_11, compile_java_21] | ||
|
|
||
| steps: | ||
| - name: Download jar files from artifacts | ||
| - name: Download java 8 jar files | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: jarfiles | ||
| name: jarfiles-java8 | ||
| - name: Download java 11 jar files | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: jarfiles-java11 | ||
| - name: Download java 21 jar files | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: jarfiles-java21 | ||
|
|
||
| - name: Create release v${{ needs.get_versions.outputs.version_8 }} | ||
| uses: ncipollo/[email protected] | ||
|
|
@@ -110,32 +140,5 @@ jobs: | |
| draft: true | ||
| generateReleaseNotes: true | ||
| skipIfReleaseExists: true | ||
| artifactErrorsFailBuild: true | ||
| artifacts: "*.jar" | ||
| artifactContentType: application/java-archive | ||
|
|
||
| # # Needs to delete the old jars manually | ||
| # - run: mkdir lib && cp *.jar lib/ | ||
| # - run: cd lib && mkdir libj8 && mv *Java8.jar libj8/ && cd .. | ||
|
|
||
| # - name: Create release branch in neqsimpython repo | ||
| # uses: GuillaumeFalourd/[email protected] | ||
| # with: | ||
| # repository_owner: Equinor | ||
| # repository_name: neqsimpython | ||
| # new_branch_name: NeqSim-jars-updated-${{ needs.get_versions.outputs.version_8 }} | ||
| # ssh_deploy_key: ${{ secrets.SSH_DEPLOY_KEY }} | ||
|
|
||
| # - name: Push directory to another repository | ||
| # uses: cpina/[email protected] | ||
| # env: | ||
| # SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} | ||
| # with: | ||
| # source-directory: 'lib' | ||
| # destination-github-username: 'equinor' | ||
| # destination-repository-name: 'neqsimpython' | ||
| # user-email: [email protected] | ||
| # target-branch: NeqSim-jars-updated-${{ needs.get_versions.outputs.version_8 }} | ||
| # target-directory: neqsim/lib | ||
| # commit_message: 'chore: updated jar-files' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,3 +87,6 @@ test_*.ser | |
| html/ | ||
| latex/ | ||
| eclipse_dictionary.txt | ||
|
|
||
| src/main/**/*.png | ||
| src/main/**/*.gif | ||
Oops, something went wrong.