From ff283afb9b655f57cee4056c58dc2db413739b88 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 29 Jan 2024 11:35:18 +0400 Subject: [PATCH] [TH2-5157] updated workflows --- ...publish-sonatype.yml => build-dev-release.yml} | 9 +++------ ...ava-publish-sonatype.yml => build-release.yml} | 15 +++++---------- ...va-publish-sonatype.yml => build-sanpshot.yml} | 13 +++++-------- .github/workflows/ci-unwelcome-words.yml | 4 ++-- .github/workflows/dependabot-java-build.yml | 2 +- 5 files changed, 16 insertions(+), 27 deletions(-) rename .github/workflows/{dev-release-java-publish-sonatype.yml => build-dev-release.yml} (74%) rename .github/workflows/{java-publish-sonatype.yml => build-release.yml} (68%) rename .github/workflows/{dev-java-publish-sonatype.yml => build-sanpshot.yml} (70%) diff --git a/.github/workflows/dev-release-java-publish-sonatype.yml b/.github/workflows/build-dev-release.yml similarity index 74% rename from .github/workflows/dev-release-java-publish-sonatype.yml rename to .github/workflows/build-dev-release.yml index 0c23d75c8..992b2a0be 100644 --- a/.github/workflows/dev-release-java-publish-sonatype.yml +++ b/.github/workflows/build-dev-release.yml @@ -1,17 +1,14 @@ -name: Build and publish dev-release Java distributions to sonatype. +name: Build and publish dev release jar to sonatype repository -on: - push: - tags: - - \d+.\d+.\d+-dev +on: workflow_dispatch jobs: build: uses: th2-net/.github/.github/workflows/compound-java.yml@main with: build-target: 'Sonatype' - runsOn: ubuntu-latest devRelease: true + createTag: true secrets: sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/java-publish-sonatype.yml b/.github/workflows/build-release.yml similarity index 68% rename from .github/workflows/java-publish-sonatype.yml rename to .github/workflows/build-release.yml index aab717525..669bca926 100644 --- a/.github/workflows/java-publish-sonatype.yml +++ b/.github/workflows/build-release.yml @@ -1,21 +1,16 @@ -name: Build and release Java distributions to sonatype. +name: Build and publish release jar to sonatype repository -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties +on: workflow_dispatch jobs: build: uses: th2-net/.github/.github/workflows/compound-java.yml@main with: build-target: 'Sonatype' - runsOn: ubuntu-latest + devRelease: false + createTag: true secrets: sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} - sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} + sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/dev-java-publish-sonatype.yml b/.github/workflows/build-sanpshot.yml similarity index 70% rename from .github/workflows/dev-java-publish-sonatype.yml rename to .github/workflows/build-sanpshot.yml index ec39beb2f..e8180f36b 100644 --- a/.github/workflows/dev-java-publish-sonatype.yml +++ b/.github/workflows/build-sanpshot.yml @@ -1,13 +1,11 @@ -name: Dev build and publish Java distributions to sonatype snapshot repository +name: Build and publish jar to sonatype snapshot repository on: push: branches-ignore: - - master - - version-* - - dependabot* - # paths: - # - gradle.properties + - master + - version-* + - dependabot* paths-ignore: - README.md @@ -16,9 +14,8 @@ jobs: uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main with: build-target: 'Sonatype' - runsOn: ubuntu-latest secrets: sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} - sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} + sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index cd7adcf39..4e5f3a6ed 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,11 +7,11 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Checkout tool - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: exactpro-th2/ci-github-action ref: master diff --git a/.github/workflows/dependabot-java-build.yml b/.github/workflows/dependabot-java-build.yml index 6947bf384..71b91f9f8 100644 --- a/.github/workflows/dependabot-java-build.yml +++ b/.github/workflows/dependabot-java-build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Build package - name: Set up JDK 11 uses: actions/setup-java@v1