You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2023/02/14 21:27:50 UTC

[openwhisk-runtime-dotnet] 01/01: handle naming conventions for core subprojects

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch dgrove-oss-patch-1
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-dotnet.git

commit 4e1c34638d66ad619d06d7cefb180ebc88ab4941
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Tue Feb 14 16:27:44 2023 -0500

    handle naming conventions for core subprojects
    
    module is either core:dotnet3.1 or core:net6.0.
---
 .github/workflows/ci.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 950c456..f30167a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,12 +90,17 @@ jobs:
           SHORT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
           ./gradlew :core:dotnet3.1:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
           ./gradlew :core:dotnet3.1:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
-          ./gradlew :core:dotnet6.0:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
-          ./gradlew :core:dotnet6.0:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
+          ./gradlew :core:net6.0:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
+          ./gradlew :core:net6.0:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
       - name: Push Release Images
         if: ${{ env.PUSH_RELEASE == 'true' }}
         working-directory: runtime
         run: |
-          RUNTIME=${GITHUB_REF_NAME%@*}
+          RUNTIME_VERSION=${GITHUB_REF_NAME%@*}
           IMAGE_TAG=${GITHUB_REF_NAME##*@}
-          ./gradlew :core:dotnet$RUNTIME:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$IMAGE_TAG
+          if [ ${RUNTIME_VERSION} == "3.1" ]; then
+            RUNTIME="dotnet3.1"
+          elif [ ${RUNTIME_VERSION} == "6.0" ]; then
+            RUNTIME="net6.0"
+          fi
+          ./gradlew :core:$RUNTIME:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$IMAGE_TAG