This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 58af7d68 Update ci workflow v18
58af7d68 is described below
commit 58af7d6866b6e9af8013c693c2bc6a46136143c1
Author: mfordjody <[email protected]>
AuthorDate: Fri Jul 4 15:04:40 2025 +0800
Update ci workflow v18
---
.github/workflows/release.yaml | 58 ++++++++++++++++++++++++++++++++----
release/downloadDubboCandidate.sh | 6 ++--
samples/app/consumer/deployment.yaml | 36 ----------------------
samples/app/consumer/service.yaml | 28 -----------------
samples/app/provider/deployment.yaml | 36 ----------------------
samples/app/provider/service.yaml | 28 -----------------
6 files changed, 55 insertions(+), 137 deletions(-)
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ba5f98a2..5e17880f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -116,6 +116,21 @@ jobs:
mv bin/dubbo-cp* build/dubbo-cp/
ls -ln build/dubbo-cp/
+ - name: Dubbo Build binary
+ env:
+ GOOS: ${{ matrix.goos }}
+ GOARCH: ${{ matrix.goarch }}
+ GIT_VERSION: ${{ github.ref_name }}
+ run: |
+ mkdir -p build/dubbo-cp
+ mkdir -p build/dubboctl
+ make build-dubbo-cp GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
+ make build-dubboctl GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
+ cp README.md LICENSE build/
+ mv bin/dubbo-cp* build/dubbo-cp/
+ mv bin/dubboctl* build/dubboctl/
+ ls -ln build/dubboctl/ ; ls -ln build/dubbo-cp/ ; ls -ln build/
+
- name: Dubboctl Rename windows
if: matrix.goos == 'windows'
run: |
@@ -164,22 +179,53 @@ jobs:
echo "name=${FILENAME}.tar.gz" >> $GITHUB_OUTPUT
fi
- - name: Upload Dubboctl Release Asset
+ - name: dubbo Package files
+ id: package_dubbo
+ run: |
+ VERSION=${GITHUB_REF#refs/tags/}
+ FILENAME=dubbo-${VERSION}-${{ matrix.goos }}-${{ matrix.goarch }}
+ DIRNAME=dubbo-${VERSION}
+ mkdir -p ${DIRNAME}/bin
+ cp build/dubboctl/dubboctl ${DIRNAME}/bin/
+ cp build/dubbo-cp/dubbo-cp ${DIRNAME}/bin/
+ cp build/README.md build/LICENSE ${DIRNAME}
+ cp build/dubbo-cp/dubbo-cp.yaml ${DIRNAME}
+ cp -r ../samples/ ${DIRNAME}/samples
+ ls -Rlh ${DIRNAME}
+ if [ "${{ matrix.goos }}" = "windows" ]; then
+ zip -r ${FILENAME}.zip ${DIRNAME}
+ echo "name=${FILENAME}.zip" >> $GITHUB_OUTPUT
+ else
+ tar -czvf ${FILENAME}.tar.gz ${DIRNAME}
+ echo "name=${FILENAME}.tar.gz" >> $GITHUB_OUTPUT
+ fi
+
+ - name: Upload Dubboctl Release Asset
+ uses: actions/upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ needs.create_release.outputs.upload_url }}
+ asset_path: ${{ steps.package_ctl.outputs.name }}
+ asset_name: ${{ steps.package_ctl.outputs.name }}
+ asset_content_type: application/octet-stream
+
+ - name: Upload Dubbo-CP Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create_release.outputs.upload_url }}
- asset_path: ${{ steps.package_ctl.outputs.name }}
- asset_name: ${{ steps.package_ctl.outputs.name }}
+ asset_path: ${{ steps.package_cp.outputs.name }}
+ asset_name: ${{ steps.package_cp.outputs.name }}
asset_content_type: application/octet-stream
- - name: Upload Dubbo-CP Release Asset
+ - name: Upload Dubbo Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create_release.outputs.upload_url }}
- asset_path: ${{ steps.package_cp.outputs.name }}
- asset_name: ${{ steps.package_cp.outputs.name }}
+ asset_path: ${{ steps.package_dubbo.outputs.name }}
+ asset_name: ${{ steps.package_dubbo.outputs.name }}
asset_content_type: application/octet-stream
\ No newline at end of file
diff --git a/release/downloadDubboCandidate.sh
b/release/downloadDubboCandidate.sh
index 6ba0edbe..81a2b974 100644
--- a/release/downloadDubboCandidate.sh
+++ b/release/downloadDubboCandidate.sh
@@ -9,8 +9,8 @@ else
OSEXT="linux"
fi
-# Package type, default to dubbo-cp
-PACKAGE_TYPE="${PACKAGE_TYPE:-dubbo-cp}"
+# Package type, default to dubbo
+PACKAGE_TYPE="${PACKAGE_TYPE:-dubbo}"
# Determine the latest Dubbo version by version number ignoring alpha, beta,
and rc versions.
if [ "${DUBBO_VERSION}" = "" ] ; then
@@ -23,7 +23,7 @@ if [ "${DUBBO_VERSION}" = "" ] ; then
fi
if [ "${DUBBO_VERSION}" = "" ] ; then
- printf "Unable to get latest Dubbo version. Set DUBBO_VERSION env var and
re-run. For example: export DUBBO_VERSION=0.1.0\n"
+ printf "Unable to get latest Dubbo version.\n"
exit 1;
fi
diff --git a/samples/app/consumer/deployment.yaml
b/samples/app/consumer/deployment.yaml
deleted file mode 100644
index cfc2734d..00000000
--- a/samples/app/consumer/deployment.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: dubbo-samples-consumer
- namespace: dubbo-system
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: dubbo-samples-consumer
- template:
- metadata:
- labels:
- app: dubbo-samples-consumer
- spec:
- containers:
- - name: server
- image: apache/dubbo-demo:dubbo-samples-apiserver-consumer_0.0.1
- imagePullPolicy: Always
- ports:
- - containerPort: 20880
diff --git a/samples/app/consumer/service.yaml
b/samples/app/consumer/service.yaml
deleted file mode 100644
index 7b0a80d9..00000000
--- a/samples/app/consumer/service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: dubbo-samples-consumer
- namespace: dubbo-system
-spec:
- clusterIP: None
- selector:
- app: dubbo-samples-consumer
- ports:
- - protocol: TCP
- port: 20880
- targetPort: 20880
\ No newline at end of file
diff --git a/samples/app/provider/deployment.yaml
b/samples/app/provider/deployment.yaml
deleted file mode 100644
index 259843ae..00000000
--- a/samples/app/provider/deployment.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: dubbo-samples-provider
- namespace: dubbo-system
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: dubbo-samples-provider
- template:
- metadata:
- labels:
- app: dubbo-samples-provider
- spec:
- containers:
- - name: server
- image: apache/dubbo-demo:dubbo-samples-apiserver-provider_0.0.1
- imagePullPolicy: Always
- ports:
- - containerPort: 20880
\ No newline at end of file
diff --git a/samples/app/provider/service.yaml
b/samples/app/provider/service.yaml
deleted file mode 100644
index afe939b8..00000000
--- a/samples/app/provider/service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: dubbo-samples-provider
- namespace: dubbo-system
-spec:
- clusterIP: None
- selector:
- app: dubbo-samples-provider
- ports:
- - protocol: TCP
- port: 20880
- targetPort: 20880
\ No newline at end of file
