Compare commits

..

No commits in common. "main" and "v1.13.0" have entirely different histories.

4 changed files with 22 additions and 73 deletions

View File

@ -5,7 +5,6 @@ on:
branches: branches:
- 'master' - 'master'
- 'main' - 'main'
workflow_dispatch:
jobs: jobs:
update_release_draft: update_release_draft:

View File

@ -18,14 +18,14 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ] os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ]
java: [ '8', '11', '17', '21', '25' ] java: [ '8', '11', '17', '21' ]
maven: [ '3.8.8', '3.9.14' ] maven: [ '3.8.8', '3.9.6' ]
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ./ - uses: ./
with: with:
@ -41,11 +41,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: ./ - uses: ./
- run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.14 - run: mvn -V validate -Drequire.java=17 -Drequire.maven=3.9.6
shell: bash shell: bash
test-ok: test-ok:

View File

@ -28,14 +28,11 @@ For default values you only need:
| params | destination | default | | params | destination | default |
|------------------------------|---------------------|--------------------------| |------------------------------|---------------------|--------------------------|
| checkout-enabled | enabled | true |
| checkout-fetch-depth | fetch-depth | | | checkout-fetch-depth | fetch-depth | |
| checkout-submodules | submodules | |
| checkout-path | path | | | checkout-path | path | |
| checkout-ref | ref | | | checkout-ref | ref | |
| checkout-repository | repository | ${{ github.repository }} | | checkout-repository | repository | ${{ github.repository }} |
| checkout-token | token | ${{ github.token }} | | checkout-token | token | ${{ github.token }} |
| checkout-ssh-key | ssh-key | |
| checkout-persist-credentials | persist-credentials | false | | checkout-persist-credentials | persist-credentials | false |
## setup-java ## setup-java
@ -44,7 +41,6 @@ For default values you only need:
|-------------------|--------------|---------| |-------------------|--------------|---------|
| java-version | java-version | 17 | | java-version | java-version | 17 |
| java-distribution | distribution | zulu | | java-distribution | distribution | zulu |
| java-jdkFile | jdkFile | |
## cache ## cache
@ -74,21 +70,17 @@ So we can use for action:
| params | destination | default | | params | destination | default |
|---------------|---------------|---------| |---------------|---------------|---------|
| maven-version | maven-version | 3.9.14 | | maven-version | maven-version | 3.9.6 |
## maven-settings-action ## maven-settings-action
| params | destination | | params | destination |
|-----------------------------|--------------------| |----------------------------|-------------------|
| settings-servers | servers | | settings-servers | servers |
| settings-mirrors | mirrors | | settings-mirrors | mirrors |
| settings-properties | properties | | settings-properties | properties |
| settings-sonatypeSnapshots | sonatypeSnapshots | | settings-sonatypeSnapshots | sonatypeSnapshots |
| settings-proxies | proxies | | settings-proxies | proxies |
| settings-repositories | repositories |
| settings-pluginRepositories | pluginRepositories |
| settings-githubServer | githubServer |
| settings-path | path |
# Testing against different Maven versions # Testing against different Maven versions
@ -100,7 +92,7 @@ jobs:
strategy: strategy:
matrix: matrix:
maven: [ '3.8.8', '3.9.8' ] maven: [ '3.8.8', '3.9.6' ]
name: Maven ${{ matrix.maven }} sample name: Maven ${{ matrix.maven }} sample

View File

@ -8,19 +8,10 @@ branding:
inputs: inputs:
# checkout # checkout
checkout-enabled:
description: 'Enable checkout'
default: 'true'
required: false
checkout-fetch-depth: checkout-fetch-depth:
description: 'Number of commits to fetch' description: 'Number of commits to fetch'
required: false required: false
checkout-submodules:
description: 'Whether to fetch submodules'
required: false
checkout-path: checkout-path:
description: 'Relative path under $GITHUB_WORKSPACE to place the repository' description: 'Relative path under $GITHUB_WORKSPACE to place the repository'
required: false required: false
@ -44,10 +35,6 @@ inputs:
required: false required: false
default: ${{ github.token }} default: ${{ github.token }}
checkout-ssh-key:
description: 'SSH key used to fetch the repository. It allows to run authenticated git commands'
required: false
# java jdk params # java jdk params
java-version: java-version:
@ -60,10 +47,6 @@ inputs:
default: 'zulu' default: 'zulu'
required: false required: false
java-jdkFile:
description: 'Java JDK compressed file location'
required: false
# cache # cache
cache-enabled: cache-enabled:
description: 'Enable cache' description: 'Enable cache'
@ -86,7 +69,7 @@ inputs:
# maven version # maven version
maven-version: maven-version:
description: 'The Maven version to set up' description: 'The Maven version to set up'
default: '3.9.14' default: '3.9.6'
required: false required: false
# maven settings.xml # maven settings.xml
@ -110,48 +93,27 @@ inputs:
description: 'proxies definition in json array, e.g.: [{"id": "http-proxy", "active": "true", "protocol": "http", "host": "host", "port": "port", "nonProxyHosts": "host1|host2"}]' description: 'proxies definition in json array, e.g.: [{"id": "http-proxy", "active": "true", "protocol": "http", "host": "host", "port": "port", "nonProxyHosts": "host1|host2"}]'
required: false required: false
settings-repositories:
description: 'repository settings definition in json array, e.g.: [ { "id": "repoId","name": "repoName","url": "url","snapshots": { "enabled": true } } ]'
required: false
settings-pluginRepositories:
description: 'plugin repository settings definition in json array, e.g.: [{"id":"repoId","name":"repoName","url":"url","snapshots":{"enabled":true}}]'
required: false
settings-githubServer:
description: 'add to settings.xml servers server-id: github; username=$GITHUB_ACTOR and password=$GITHUB_TOKEN'
default: "true"
required: false
settings-path:
description: 'override default path to settings.xml which is $HOME/.m2/settings.xml'
required: false
runs: runs:
using: 'composite' using: 'composite'
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
if: inputs.checkout-enabled == 'true'
with: with:
fetch-depth: '${{ inputs.checkout-fetch-depth }}' fetch-depth: '${{ inputs.checkout-fetch-depth }}'
submodules: '${{ inputs.checkout-submodules }}'
path: '${{ inputs.checkout-path }}' path: '${{ inputs.checkout-path }}'
persist-credentials: '${{ inputs.checkout-persist-credentials }}' persist-credentials: '${{ inputs.checkout-persist-credentials }}'
ref: '${{ inputs.checkout-ref }}' ref: '${{ inputs.checkout-ref }}'
repository: '${{ inputs.checkout-repository }}' repository: '${{ inputs.checkout-repository }}'
token: '${{ inputs.checkout-token }}' token: '${{ inputs.checkout-token }}'
ssh-key: '${{ inputs.checkout-ssh-key }}'
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 - uses: actions/setup-java@v4
with: with:
overwrite-settings: false overwrite-settings: false
java-version: '${{ inputs.java-version }}' java-version: '${{ inputs.java-version }}'
distribution: '${{ inputs.java-distribution }}' distribution: '${{ inputs.java-distribution }}'
jdkFile: '${{ inputs.java-jdkFile }}'
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
if: inputs.cache-enabled == 'true' if: inputs.cache-enabled == 'true'
with: with:
path: | path: |
@ -165,19 +127,15 @@ runs:
shell: bash shell: bash
id: current-maven id: current-maven
- uses: stCarolas/setup-maven@12eb41b233df95d49b0c11fc1b5bc8312e5d4ce0 # v5.1 - uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
if: inputs.maven-version != steps.current-maven.outputs.version if: inputs.maven-version != steps.current-maven.outputs.version
with: with:
maven-version: '${{ inputs.maven-version }}' maven-version: '${{ inputs.maven-version }}'
- uses: s4u/maven-settings-action@894661b3ddae382f1ae8edbeab60987e08cf0788 # v4.0.0 - uses: s4u/maven-settings-action@7802f6aec16c9098b4798ad1f1d8ac75198194bd # v3.0.0
with: with:
servers: '${{ inputs.settings-servers }}' servers: '${{ inputs.settings-servers }}'
mirrors: '${{ inputs.settings-mirrors }}' mirrors: '${{ inputs.settings-mirrors }}'
properties: '${{ inputs.settings-properties }}' properties: '${{ inputs.settings-properties }}'
sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots }}' sonatypeSnapshots: '${{ inputs.settings-sonatypeSnapshots }}'
proxies: '${{ inputs.settings-proxies }}' proxies: '${{ inputs.settings-proxies }}'
repositories: '${{ inputs.settings-repositories }}'
pluginRepositories: '${{ inputs.settings-pluginRepositories }}'
githubServer: '${{ inputs.settings-githubServer }}'
path: '${{ inputs.settings-path }}'