Skip to content

Commit

Permalink
Update python workflow (#53)
Browse files Browse the repository at this point in the history
* Group python and java workflows

* Correct dev snapshot trigger

* Update workflow names
  • Loading branch information
OptimumCode authored Jul 18, 2024
1 parent 4aa5809 commit 9f2fa80
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 93 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-unwelcome-words.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
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
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/dev-java-publish-sonatype.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/dev-release-grpc-service-pypi-publish.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/dev-release-java-publish-sonatype.yml

This file was deleted.

33 changes: 33 additions & 0 deletions .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and publish dev-release Java distributions to sonatype and python to PyPi.

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 }}
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
collect-version:
name: Get version from gradle.properties
uses: th2-net/.github/.github/workflows/compound-prebuild-java-dev-workflow.yml@main
build-n-publish:
name: Dev build and Python distributions to PyPI
needs: [collect-version]
uses: th2-net/.github/.github/workflows/compaund-python-grpc-pypi-publication.yml@main
with:
custom-version: ${{ needs.collect-version.outputs.versionNumber }}rc1
secrets:
pypi_password: ${{ secrets.PYPI_PASSWORD }}
scan:
name: Vulnerabilities scan
uses: th2-net/.github/.github/workflows/python-scan.yml@main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Dev build and publish Python distributions to PyPI. New gRPC generator
name: Dev build and publish Java distributions to sonatype snapshot repository and python to PyPi

on:
push:
Expand All @@ -9,6 +9,17 @@ on:
- README.md

jobs:
build-job:
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 }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
collect-version:
name: Get version from gradle.properties
uses: th2-net/.github/.github/workflows/compound-prebuild-java-dev-workflow.yml@main
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/grpc-services-pypi-publish.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
name: Build and release Java distributions to sonatype.
name: Build and release Java distributions to sonatype and python to PyPi

on:
push:
branches:
- master
- version-*
paths:
- gradle.properties
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 }}
nvd-api-key: ${{ secrets.NVD_APIKEY }}
build-n-publish:
name: Build and Python distributions to PyPI
uses: th2-net/.github/.github/workflows/compaund-python-grpc-pypi-publication.yml@main
secrets:
pypi_password: ${{ secrets.PYPI_PASSWORD }}
scan:
name: Vulnerabilities scan
uses: th2-net/.github/.github/workflows/python-scan.yml@main

0 comments on commit 9f2fa80

Please sign in to comment.