Skip to content

Commit

Permalink
feat: fix Java functional tests for Gradle legacy versions
Browse files Browse the repository at this point in the history
  • Loading branch information
flelli committed Dec 20, 2024
1 parent 7435b45 commit 8d52b74
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-nyx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ runs:
# by the previous step into the build/.nyx-state.json and export it to outputs.
id: nyx
if: ${{ inputs.enable-action == 'true' }}
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
- name: Publish the job artifacts with the Nyx state and summary
uses: actions/upload-artifact@v4
if: ${{ inputs.enable-artifacts == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .nyx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,6 @@ substitutions:
- docusaurus
items:
docusaurus:
files: "**/docs/main/src/data/projectVariables.js"
files: "docs/main/src/data/projectVariables.js"
match: "version(\\s)*:(\\s)*'(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?'"
replace: "version: '{{version}}'"
4 changes: 2 additions & 2 deletions docs/main/docs/resources/examples/combined-use-examples.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
# Here we use the Nyx GitHub Action just to read the data from its state file (generated in the above step)
- name: Load Nyx data
id: nyx
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
# The following parameters are here just to show but 'infer' is the default command while the other options are set in the configuration file
#with:
# command: infer
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
# Here we use the Nyx GitHub Action just to read the data from its state file (generated in the above step)
- name: Load Nyx data
id: nyx
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
# The following parameters are here just to show but 'infer' is the default command while the other options are set in the configuration file
#with:
# command: infer
Expand Down
2 changes: 1 addition & 1 deletion docs/main/docs/user/introduction/ci-cd.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Running Nyx using the [GitHub Action](https://mooltiverse.github.io/nyx-github-a
release:
steps:
- name: Release
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
10 changes: 4 additions & 6 deletions docs/main/docs/user/introduction/combined-release-process.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ jobs:
with:
fetch-depth: 0
- name: Run nyx Infer
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
with:
command: infer
resume: true
stateFile: .nyx-state.json
# Run other tasks here....
- name: Run nyx Publish
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
with:
command: publish
resume: true
Expand All @@ -108,7 +108,7 @@ jobs:
key: ${{ github.run_id }}-nyx-state
restore-keys: ${{ github.run_id }}-nyx-state
- name: Run nyx Infer
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
with:
command: infer
resume: true
Expand All @@ -131,15 +131,13 @@ jobs:
key: ${{ github.run_id }}-nyx-state
restore-keys: ${{ github.run_id }}-nyx-state
- name: Run nyx Publish
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@main
with:
command: publish
resume: true
stateFile: .nyx-state.json
```
Please refer to the [Nyx GitHub Action](https://github.com/mooltiverse/nyx-github-action?tab=readme-ov-file#combined-release-process) for more.
## Using a combination of Nyx flavors
The above shows how Nyx makes available specific commands for different stages of a build process and how the overall process can mix Nyx and other tools. This includes the case where different flavors or Nyx may be needed together.
Expand Down
4 changes: 0 additions & 4 deletions docs/main/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,6 @@ export default {
label: 'Gradle Plug-In',
to: 'https://plugins.gradle.org/plugin/com.mooltiverse.oss.nyx',
},
{
label: 'GitHub Action',
to: 'https://github.com/mooltiverse/nyx-github-action',
},
{
label: 'Go Docs',
to: 'https://godocs.io/github.com/mooltiverse/nyx/src/go/nyx',
Expand Down
7 changes: 1 addition & 6 deletions docs/main/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ const RESOURCES: ResourceItem[] = [
"title": "Releases",
"url": "https://github.com/mooltiverse/nyx/releases/latest",
"logo": ''
},
{
"title": "Action",
"url": "https://github.com/mooltiverse/nyx-github-action",
"logo": ''
}
]
},
Expand Down Expand Up @@ -242,7 +237,7 @@ const FEATURES: FeatureItem[] = [
},
description: (
<>
<a href='https://github.com/mooltiverse/nyx-github-action' target='_blank'>GitHub Action</a> available.
<a href='https://mooltiverse.github.io/nyx/docs/user/quick-start/github-action' target='_blank'>GitHub Action</a> available.
</>
),
},
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
------------------------------------------------------------------------------*/
plugins {
// use our own plugin
id "com.mooltiverse.oss.nyx" version "3.0.11"
id "com.mooltiverse.oss.nyx" version "3.1.0"

// Gradle Enterprise plugin (used for build scans)
id "com.gradle.enterprise" version "3.16.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ public static String[] wellKnownWorkingGradleVersions(boolean quickTestsOnly) {
extensiveTestVersions.add("8.6");
extensiveTestVersions.add("8.5");
extensiveTestVersions.add("8.4");
extensiveTestVersions.add("8.3");
// These tests are suspended due to the 'GRADLE MULTI-RELEASE JARS ERROR'
// commented above.
//extensiveTestVersions.add("8.3");
}
if (javaVersion <= 19) {
// GRADLE MULTI-RELEASE JARS ERROR
Expand Down

0 comments on commit 8d52b74

Please sign in to comment.