You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/03/06 07:17:29 UTC
[incubator-pekko-grpc] branch main updated: Fix publish
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new bd38ead3 Fix publish
bd38ead3 is described below
commit bd38ead39ceda81034d30e6066ce7a845d1eb8cc
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Mar 2 11:58:28 2023 +0100
Fix publish
---
.github/workflows/build-test.yml | 10 ++--
.github/workflows/publish.yml | 111 +++++++++++++++++++--------------------
.jvmopts-ci | 4 ++
.jvmopts-ghactions | 4 --
4 files changed, 64 insertions(+), 65 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index a4837053..3821e30d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -41,7 +41,7 @@ jobs:
- name: Binary-compatibility check
run: |-
- cp .jvmopts-ghactions .jvmopts
+ cp .jvmopts-ci .jvmopts
sbt headerCheckAll grpcVersionSyncCheck googleProtobufVersionSyncCheck +mimaReportBinaryIssues
compile-benchmarks:
@@ -123,7 +123,7 @@ jobs:
uses: coursier/cache-action@v6
- name: Scripted ${{ matrix.test-set }}
- run: cp .jvmopts-ghactions .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-plugin/scripted ${{ matrix.test-set }}/*"
+ run: cp .jvmopts-ci .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-plugin/scripted ${{ matrix.test-set }}/*"
test-gradle:
name: Gradle tests
@@ -160,7 +160,7 @@ jobs:
- name: Publish artifacts locally
run: |-
- cp .jvmopts-ghactions .jvmopts
+ cp .jvmopts-ci .jvmopts
sbt codegen/publishM2 scalapb-protoc-plugin/publishM2 +runtime/publishM2
cd gradle-plugin
./gradlew clean publishToMavenLocal --console=plain --info --stacktrace
@@ -214,7 +214,7 @@ jobs:
- name: Publish artifacts locally
run: |-
- cp .jvmopts-ghactions .jvmopts
+ cp .jvmopts-ci .jvmopts
sbt codegen/publishM2 scalapb-protoc-plugin/publishM2 +runtime/publishM2 maven-plugin/publishM2
- name: Test Maven Java
@@ -245,5 +245,5 @@ jobs:
uses: coursier/cache-action@v6
- name: Test Maven Java
run: |-
- cp .jvmopts-ghactions .jvmopts
+ cp .jvmopts-ci .jvmopts
sbt paradox
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1c9a2934..1d4ec872 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,62 +26,61 @@ jobs:
- name: Publish
run: |-
- cp .jvmopts-ghactions .jvmopts
- sbt ci-release
- CI_RELEASE=codegen/publishSigned CI_SNAPSHOT_RELEASE=codegen/publish sbt ++2.13.8\! ci-release
+ cp .jvmopts-ci .jvmopts
+ sbt +publish
env:
- PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
- PGP_SECRET: ${{ secrets.PGP_SECRET }}
- SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
- SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+ NEXUS_USER: ${{ secrets.NEXUS_USER }}
+ NEXUS_PW: ${{ secrets.NEXUS_PW }}
- gradle-plugin:
- name: Release gradle plugin
- runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-grpc'
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
- fetch-depth: 0
-
- - name: Setup Java 8
- uses: actions/setup-java@v3
- with:
- distribution: temurin
- java-version: 8
-
- - name: Publish Plugin to Gradle Plugin Repository
- run: cd gradle-plugin && ./gradlew publishPlugins -Pgradle.publish.key='${{ secrets.GRADLE_PUBLISH_KEY }}' -Pgradle.publish.secret='${{ secrets.GRADLE_SECRET }}'
-
- documentation:
- name: Documentation
- runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-grpc'
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
- fetch-depth: 0
-
- - name: Setup Java 8
- uses: actions/setup-java@v3
- with:
- distribution: temurin
- java-version: 8
+# TODO: Need to figure out where to publish gradle plugin, see https://github.com/apache/incubator-pekko-grpc/issues/40
+# gradle-plugin:
+# name: Release gradle plugin
+# runs-on: ubuntu-latest
+# if: github.repository == 'apache/incubator-pekko-grpc'
+# steps:
+# - name: Checkout
+# uses: actions/checkout@v3
+# with:
+# # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+# fetch-depth: 0
+#
+# - name: Setup Java 8
+# uses: actions/setup-java@v3
+# with:
+# distribution: temurin
+# java-version: 8
+#
+# - name: Publish Plugin to Gradle Plugin Repository
+# run: cd gradle-plugin && ./gradlew publishPlugins -Pgradle.publish.key='${{ secrets.GRADLE_PUBLISH_KEY }}' -Pgradle.publish.secret='${{ secrets.GRADLE_SECRET }}'
- - name: Cache Coursier cache
- uses: coursier/cache-action@v6
-
- - name: Publish
- run: |-
- eval "$(ssh-agent -s)"
- echo $SCP_SECRET | base64 -d > /tmp/id_rsa
- chmod 600 /tmp/id_rsa
- ssh-add /tmp/id_rsa
- cp .jvmopts-ghactions .jvmopts
- sbt docs/publishRsync
- env:
- SCP_SECRET: ${{ secrets.SCP_SECRET }}
+# TODO: Replace doc publishing with our own solution
+# documentation:
+# name: Documentation
+# runs-on: ubuntu-latest
+# if: github.repository == 'apache/incubator-pekko-grpc'
+# steps:
+# - name: Checkout
+# uses: actions/checkout@v3
+# with:
+# # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+# fetch-depth: 0
+#
+# - name: Setup Java 8
+# uses: actions/setup-java@v3
+# with:
+# distribution: temurin
+# java-version: 8
+#
+# - name: Cache Coursier cache
+# uses: coursier/cache-action@v6
+#
+# - name: Publish
+# run: |-
+# eval "$(ssh-agent -s)"
+# echo $SCP_SECRET | base64 -d > /tmp/id_rsa
+# chmod 600 /tmp/id_rsa
+# ssh-add /tmp/id_rsa
+# cp .jvmopts-ci .jvmopts
+# sbt docs/publishRsync
+# env:
+# SCP_SECRET: ${{ secrets.SCP_SECRET }}
diff --git a/.jvmopts-ci b/.jvmopts-ci
new file mode 100644
index 00000000..aa095092
--- /dev/null
+++ b/.jvmopts-ci
@@ -0,0 +1,4 @@
+# This is used to configure the sbt instance that Github Actions launches
+
+-Dfile.encoding=UTF8
+-Dsbt.color=always
diff --git a/.jvmopts-ghactions b/.jvmopts-ghactions
deleted file mode 100644
index c721e397..00000000
--- a/.jvmopts-ghactions
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is used to configure the sbt instance that Travis launches
-
--Dfile.encoding=UTF8
--Dsbt.color=always
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org