Merge pull request #64 from a110605/revert_change

revert test change

.github/workflows/build-and-upload-branch.yaml

@@ -9,6 +9,8 @@ on:
     branches:
       - main
       - 'release-harvester-v*'
+    types: 
+      - merged
 
 jobs:
   build-validation:

.github/workflows/build-and-upload.yaml

@@ -21,46 +21,6 @@ env:
   REPO: ${{github.event.repository.name || ''}}
 
 jobs:
-  # build-and-upload-docker-image:
-  #   name: Build & Upload Docker
-  #   runs-on: ubuntu-latest
-  #   permissions:
-  #     contents: read
-  #     packages: write
-  #     id-token: write
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         fetch-depth: 1
-
-  #     - id: upload-gate
-  #       name: Upload Gate
-  #       run: ./scripts/build-upload-gate
-
-  #     - id: read-docker-secrets
-  #       name: Read Docker Secrets
-  #       uses: rancher-eio/read-vault-secrets@main
-  #       with:
-  #         secrets: |
-  #           secret/data/github/repo/${{ github.repository }}/dockerhub/harvester/credentials username | DOCKER_USERNAME ;
-  #           secret/data/github/repo/${{ github.repository }}/dockerhub/harvester/credentials password | DOCKER_PASSWORD ;
-
-  #     - id: login-docker
-  #       name: Docker Log in
-  #       uses: docker/login-action@v3
-  #       with:
-  #         username: ${{ env.DOCKER_USERNAME }}
-  #         password: ${{ env.DOCKER_PASSWORD }}
-
-  #     - id: push-docker
-  #       name: Docker Build
-  #       uses: docker/build-push-action@v5
-  #       with:
-  #         provenance: false
-  #         context: .
-  #         push: true
-  #         tags: rancher/harvester-ui:${{ github.ref_name }}
-
   build-and-upload-hosted:
     name: Build & Upload Hosted
     runs-on: ubuntu-latest
@@ -100,9 +60,8 @@ jobs:
         uses: 'google-github-actions/upload-cloud-storage@v2'
         # https://github.com/google-github-actions/upload-cloud-storage
         with:
-          # TODO: replace test-release back to ${{ steps.build-hosted.outputs.BUILD_HOSTED_LOCATION }}
           path: ${{steps.build-hosted.outputs.BUILD_HOSTED_DIR}}
-          destination: releases.rancher.com/harvester-ui/dashboard/test-release
+          destination: releases.rancher.com/harvester-ui/dashboard/${{ steps.build-hosted.outputs.BUILD_HOSTED_LOCATION }}
           parent: false
           headers: |-
             cache-control: no-cache,must-revalidate
@@ -145,8 +104,7 @@ jobs:
         uses: 'google-github-actions/upload-cloud-storage@v2'
         with:
           path: ${{steps.build-embedded.outputs.BUILD_EMBEDED_TGZ}}
-          # TODO: replace test-release with ${{ env.REPO }}
-          destination: releases.rancher.com/harvester-ui/test-release
+          destination: releases.rancher.com/harvester-ui/${{ env.REPO }}
           parent: false
           headers: |-
             cache-control: no-cache,must-revalidate
@@ -199,10 +157,8 @@ jobs:
       - name: Upload plugin directory
         uses: 'google-github-actions/upload-cloud-storage@v2'
         with:
-          #TODO: replace test-release with ${{steps.ci-build-pkg.outputs.PKG_NAME}}
-          path: dist-pkg/harvester-test-release
-          #TODO: replace test-release with ${{steps.ci-build-pkg.outputs.PKG_NAME}}
-          destination: releases.rancher.com/harvester-ui/plugin/harvester-test-release
+          path: dist-pkg/${{steps.ci-build-pkg.outputs.PKG_NAME}}
+          destination: releases.rancher.com/harvester-ui/plugin/${{steps.ci-build-pkg.outputs.PKG_NAME}}
           parent: false
           headers: |-
             cache-control: no-cache,must-revalidate

pkg/harvester/l10n/en-us.yaml

@@ -979,7 +979,7 @@ harvester:
       cert: Upload a self-signed SSL certificate
     vlanChangeTip: The newly modified default network interface only applies to newly added nodes, not existing ones.
     defaultPhysicalNIC: Default Network Interface
-    modifiedMessage: (TEST RELEASE) Settings that have been customized from default settings are tagged with 'Modified'.
+    modifiedMessage: Settings that have been customized from default settings are tagged with 'Modified'.
     percentTip: The value in parentheses represents the distribution percentage of the network interface on all hosts. If an interface less than 100% is selected, the user needs to manually specify the network interface on the host where the vlan network configuration fails.
     message:
       ca:

scripts/build-hosted

@@ -18,7 +18,7 @@ echo "TAG: ${GIT_TAG:-<none>}"
 DIR=${GIT_TAG:-$COMMIT_BRANCH}
 
 if [[ "${DIR}" == "main" ]]; then
-  DIR="test-release"
+  DIR="latest"
 fi
 
 BASE=${BASE:-https://releases.rancher.com/harvester-ui/dashboard/${DIR}}

scripts/ci-build-pkg.sh

@@ -5,7 +5,7 @@ yarn --pure-lockfile install
 source scripts/version
 
 if [[ $COMMIT_BRANCH == "main" ]]; then
-  VERSION="test-release"
+  VERSION="latest"
 else
   VERSION=$COMMIT_BRANCH
 fi
@@ -31,11 +31,11 @@ if [ -n "$GIT_TAG" ]; then
   export PKG_NAME=${1}-${CI_BUILD_TAG}
   export PKG_TARBALL=${PKG_NAME}.tar.gz
 else
-  export PKG_NAME=${1}-${VERSION} # harvester-test-release or harvester-latest
-  export PKG_TARBALL=${PKG_NAME}.tar.gz # harvester-test-release.tar.gz or harvester-latest.tar.gz
+  export PKG_NAME=${1}-${VERSION} # harvester-release-harvester-v1.5 or harvester-latest
+  export PKG_TARBALL=${PKG_NAME}.tar.gz # harvester-release-harvester-v1.5.tar.gz or harvester-latest.tar.gz
 fi
 
-echo "CI Build Artefacts"
+echo "CI Build Artifacts"
 echo "Package Directory: ${PKG_NAME}"
 echo "Package Tarball: ${PKG_TARBALL}"