From d826d17de29f0a1cb507777cd77d4a4c13a4c2f0 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 10 Dec 2021 03:22:13 -0800 Subject: [PATCH 01/13] GitHub action to publish Java/Scala --- .github/workflows/continuous-integration.yml | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index cebdbddea3..f0b1000f98 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,4 +1,4 @@ -name: whylogs CI + 11name: whylogs CI on: push: @@ -55,6 +55,25 @@ jobs: flag-name: run-${{ matrix.os }}-${{matrix.python-version}} parallel: true github-token : ${{ secrets.GITHUB_TOKEN}} + java: + runs-on: ubuntu-latest + defaults: + run: + shell: bash + working-directory: java + + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: Setup JDK + uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Run build and tests + run: | + ./gradlew build + finish: needs: test runs-on: ubuntu-latest From 444b3e7d2e0dbb81aa4e3d23539198a1d592f8c2 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 10 Dec 2021 12:30:40 -0800 Subject: [PATCH 02/13] typo --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index f0b1000f98..30c77db16a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,4 +1,4 @@ - 11name: whylogs CI + name: whylogs CI on: push: From 69f1f4795115d2e0e8971eb7674bcab1fa33ddd6 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 03:45:14 -0800 Subject: [PATCH 03/13] wip --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 30c77db16a..e68d7eb262 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,4 +1,4 @@ - name: whylogs CI +name: whylogs CI on: push: @@ -58,7 +58,7 @@ jobs: java: runs-on: ubuntu-latest defaults: - run: + run: echo ${{ secrets.NEXUS_TOKEN_USERNAME }} | md5sum shell: bash working-directory: java From d1d24f7c57fa771f9b54fc71291d7020b400cc11 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 03:57:07 -0800 Subject: [PATCH 04/13] wip --- .github/workflows/continuous-integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e68d7eb262..6cfe053115 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -58,7 +58,7 @@ jobs: java: runs-on: ubuntu-latest defaults: - run: echo ${{ secrets.NEXUS_TOKEN_USERNAME }} | md5sum + run: shell: bash working-directory: java @@ -70,6 +70,8 @@ jobs: uses: actions/setup-java@v1 with: java-version: 8 + - name: Test secret + run: echo ${{ secrets.NEXUS_TOKEN_USERNAME }} | md5sum - name: Run build and tests run: | ./gradlew build From 5678c668ab67853fbc2fab49b799fca07b952de9 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 04:03:10 -0800 Subject: [PATCH 05/13] s/tab/spaces/ --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6cfe053115..0d9725c6a4 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -60,7 +60,7 @@ jobs: defaults: run: shell: bash - working-directory: java + working-directory: java steps: - uses: actions/checkout@v2 From 7e12af77412e9822b6684d6df58f4c6b5877a264 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 04:07:35 -0800 Subject: [PATCH 06/13] wip --- .github/workflows/continuous-integration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 0d9725c6a4..346ea149ed 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -71,7 +71,9 @@ jobs: with: java-version: 8 - name: Test secret - run: echo ${{ secrets.NEXUS_TOKEN_USERNAME }} | md5sum + run: echo $NEXUS_USERNAME | md5sum + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_TOKEN_USERNAME }} - name: Run build and tests run: | ./gradlew build From c7c5361830340328835c5064e0f34e8b3ba4ceab Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 04:14:16 -0800 Subject: [PATCH 07/13] wip --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 346ea149ed..bc739f7d61 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -71,7 +71,7 @@ jobs: with: java-version: 8 - name: Test secret - run: echo $NEXUS_USERNAME | md5sum + run: /bin/bash -c "echo $NEXUS_USERNAME | md5sum" env: NEXUS_USERNAME: ${{ secrets.NEXUS_TOKEN_USERNAME }} - name: Run build and tests From 68f014f1761ca9ef7911e83abeb7549291ff030e Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 04:16:44 -0800 Subject: [PATCH 08/13] wip --- .github/workflows/continuous-integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index bc739f7d61..3db0eca4a3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -71,9 +71,9 @@ jobs: with: java-version: 8 - name: Test secret - run: /bin/bash -c "echo $NEXUS_USERNAME | md5sum" - env: - NEXUS_USERNAME: ${{ secrets.NEXUS_TOKEN_USERNAME }} + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_TOKEN_USERNAME }} + run: /bin/bash -c "echo $NEXUS_USERNAME | md5sum" - name: Run build and tests run: | ./gradlew build From 1f529965e91919cd33fe5a46a5be80af4ddbe4ae Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 13:06:42 -0800 Subject: [PATCH 09/13] wip --- .github/workflows/continuous-integration.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3db0eca4a3..cf1486ccf8 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -77,6 +77,14 @@ jobs: - name: Run build and tests run: | ./gradlew build + - name: publish to Nexus + uses: sonatype-nexus-community/iq-github-action@master + with: + serverUrl: https://oss.sonatype.org + username: ${{ secrets.NEXUS_TOKEN_USERNAME }} + password: ${{ secrets.NEXUS_TOKEN_PASSWORD }} + applicationId: aiwhylogs + stage: java finish: needs: test From 8b63f22ec676232f761f27b391e8a11d9b189ec1 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 13:13:38 -0800 Subject: [PATCH 10/13] wip --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index cf1486ccf8..501e3a7f1a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -84,7 +84,7 @@ jobs: username: ${{ secrets.NEXUS_TOKEN_USERNAME }} password: ${{ secrets.NEXUS_TOKEN_PASSWORD }} applicationId: aiwhylogs - stage: java + stage: build finish: needs: test From c35965e3863164ae431528200483ecb45e484b9c Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Mon, 13 Dec 2021 17:22:49 -0800 Subject: [PATCH 11/13] experiments complete --- .github/workflows/continuous-integration.yml | 31 -------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 501e3a7f1a..cebdbddea3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -55,37 +55,6 @@ jobs: flag-name: run-${{ matrix.os }}-${{matrix.python-version}} parallel: true github-token : ${{ secrets.GITHUB_TOKEN}} - java: - runs-on: ubuntu-latest - defaults: - run: - shell: bash - working-directory: java - - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Setup JDK - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Test secret - env: - NEXUS_USERNAME: ${{ secrets.NEXUS_TOKEN_USERNAME }} - run: /bin/bash -c "echo $NEXUS_USERNAME | md5sum" - - name: Run build and tests - run: | - ./gradlew build - - name: publish to Nexus - uses: sonatype-nexus-community/iq-github-action@master - with: - serverUrl: https://oss.sonatype.org - username: ${{ secrets.NEXUS_TOKEN_USERNAME }} - password: ${{ secrets.NEXUS_TOKEN_PASSWORD }} - applicationId: aiwhylogs - stage: build - finish: needs: test runs-on: ubuntu-latest From c375ea905e0d2a6d820481530dfba5b7e563d0f0 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Tue, 14 Dec 2021 01:51:40 -0800 Subject: [PATCH 12/13] the real work --- .../{gradle-build-pr.yml => java-continuous-integration.yml} | 4 +++- .github/workflows/push_release.yml | 4 ++-- ...uous-integration.yml => python-continuous-integration.yml} | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename .github/workflows/{gradle-build-pr.yml => java-continuous-integration.yml} (91%) rename .github/workflows/{continuous-integration.yml => python-continuous-integration.yml} (100%) diff --git a/.github/workflows/gradle-build-pr.yml b/.github/workflows/java-continuous-integration.yml similarity index 91% rename from .github/workflows/gradle-build-pr.yml rename to .github/workflows/java-continuous-integration.yml index 297c945aa6..468ada4f88 100644 --- a/.github/workflows/gradle-build-pr.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -1,7 +1,9 @@ name: Run Gradle on PRs on: + push: + branches: [ mainline, release] pull_request: - branches: [ mainline ] + branches: [ mainline, release] jobs: build: diff --git a/.github/workflows/push_release.yml b/.github/workflows/push_release.yml index ef7d9ec3a5..469140ecee 100644 --- a/.github/workflows/push_release.yml +++ b/.github/workflows/push_release.yml @@ -1,4 +1,4 @@ -name: Upload Python Package +name: Upload Whylogs Packages on: @@ -107,4 +107,4 @@ jobs: team-reviewers: | owners maintainers - draft: false \ No newline at end of file + draft: false diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/python-continuous-integration.yml similarity index 100% rename from .github/workflows/continuous-integration.yml rename to .github/workflows/python-continuous-integration.yml From ce0e2fdacbb79f458eb3266c4b74db56e741e511 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Tue, 14 Dec 2021 01:55:35 -0800 Subject: [PATCH 13/13] yeah, save the file before committing it... --- .github/workflows/push_release.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push_release.yml b/.github/workflows/push_release.yml index 469140ecee..4d9cf088b4 100644 --- a/.github/workflows/push_release.yml +++ b/.github/workflows/push_release.yml @@ -52,7 +52,7 @@ jobs: branch: ${{ github.ref }} force: true - - name: Build and publish + - name: Build and publish Python env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} @@ -60,6 +60,13 @@ jobs: make clean make dist poetry run twine upload dist/* + + - name: Set up Java + uses: actions/setup-java@v1 + - name: Build and publish Java + run: ./gradlew publish -PossrhUsername=${{ secrets.NEXUS_TOKEN_USERNAME }} -PossrhPassword=${{ secrets.NEXUS_TOKEN_PASSWORD }} + working-directory: java + bump_mainline: runs-on: ubuntu-latest needs: deploy