merged steps again

opentelekomcloud · Jul 11, 2024 · f3829a4 · f3829a4
1 parent 11fafd3
commit f3829a4
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
     #   branches: 
     #     - main
 jobs:
-    build-app:
+    build:
       environment: preview
       runs-on: ubuntu-latest
 
@@ -29,16 +29,7 @@ jobs:
             TYPESENSE_PORT: ${{ vars.TYPESENSE_PORT }}
             TYPESENSE_API_KEY: ${{ secrets.TYPESENSE_API_KEY }}
           run: npm run build
-
-    build-push-docker:
-      environment: preview
-      runs-on: ubuntu-latest
-      needs: build-app
-
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v2
-
+
         - name: Login to Docker Hub
           uses: docker/login-action@v3
           with:
@@ -68,7 +59,7 @@ jobs:
         #   run: echo ${{ steps.docker_build.outputs.digest }}
 
     update-helm-charts:
-      needs: [build-app, build-push-docker]
+      needs: [build]
       environment: preview
       runs-on: ubuntu-latest
 
@@ -101,8 +92,7 @@ jobs:
             sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml
             sed -i 's/^appVersion: .*/appVersion: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/Chart.yaml
             # sed -i 's/^\ttag: .*/\ttag: ${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml
-            # sed -r "s/^(\s*${tag}\s*:\s*).*/\1${${{ steps.commit_hash.outputs.short }}}/" -i ./charts/docusaurus/values.yaml
-            sed 's/^\(tag: \).*$/\${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml
+            sed -ri "s/^(\s*${tag}\s*:\s*).*/\1${${{ steps.commit_hash.outputs.short }}}/" ./charts/docusaurus/values.yaml
             sed -i 's/^typesenseHost: .*/typesenseHost: ${{ vars.TYPESENSE_HOST }}/' ./charts/docusaurus/values.yaml
             sed -i 's/^typesensePort: .*/typesensePort: ${{ vars.TYPESENSE_PORT }}/' ./charts/docusaurus/values.yaml
             sed -i 's/^typesenseProtocol: .*/typesenseProtocol: ${{ vars.TYPESENSE_PROTOCOL }}/' ./charts/docusaurus/values.yaml