diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a217b347..85705150 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,3 +5,7 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 +package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg deleted file mode 100644 index d2598761..00000000 Binary files a/.github/release/maven-settings.xml.gpg and /dev/null differ diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg deleted file mode 100644 index ffd7b0f0..00000000 Binary files a/.github/release/smallrye-sign.asc.gpg and /dev/null differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2e60bf4..61b5ab8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,35 +23,23 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [17] - name: build with jdk ${{matrix.java}} + java: [ + { 'version': '17', 'opts': '' }, + { 'version': '21', 'opts': '' }, + { 'version': '22', 'opts': '' } + ] + name: build with jdk ${{matrix.java.version}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 name: checkout - - - uses: actions/setup-java@v1 - name: set up jdk ${{matrix.java}} + - uses: actions/setup-java@v4 + name: set up jdk ${{matrix.java.version}} with: - java-version: ${{matrix.java}} - + distribution: temurin + java-version: ${{matrix.java.version}} + cache: maven + - name: validate format + run: mvn -f pom.xml -B ${{matrix.java.opts}} formatter:validate - name: build with maven - run: mvn -B formatter:validate verify --file pom.xml - - quality: - needs: [build] - if: github.event_name == 'push' && github.repository_owner == 'smallrye' - runs-on: ubuntu-latest - name: quality - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: sonar - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - SONAR_TOKEN: ${{secrets.SONAR_TOKEN}} - run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-context-propagation -Dsonar.login=$SONAR_TOKEN + run: mvn -f pom.xml -B verify ${{matrix.java.opts}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12bd6a57..528a9ff0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,27 +22,35 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: token: ${{secrets.RELEASE_TOKEN}} - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: java-version: 17 + distribution: temurin + cache: maven + server-id: 'oss.sonatype' + server-username: 'MAVEN_DEPLOY_USERNAME' + server-password: 'MAVEN_DEPLOY_TOKEN' + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: 'MAVEN_GPG_PASSPHRASE' - name: maven release ${{steps.metadata.outputs.current-version}} + env: + MAVEN_DEPLOY_USERNAME: ${{ secrets.MAVEN_DEPLOY_USERNAME }} + MAVEN_DEPLOY_TOKEN: ${{ secrets.MAVEN_DEPLOY_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} run: | java -version - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg - gpg --fast-import --no-tty --batch --yes smallrye-sign.asc git config --global user.name "SmallRye CI" git config --global user.email "smallrye@googlegroups.com" git checkout -b release - mvn -B release:prepare -Prelease,coverage -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml + mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -DautoVersionSubmodules git checkout ${{github.base_ref}} git rebase release - mvn -B release:perform -Prelease -s maven-settings.xml + mvn -B release:perform -Prelease git push git push --tags