Update doc_manual.yml

Update web_build.yml Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Anton Arapov <anton@openssl.org> (Merged from #465)
openssl · Feb 15, 2024 · 7e2ce46 · 7e2ce46
1 parent ba7f5fd
commit 7e2ce46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 38 deletions.
diff --git a/.github/workflows/doc_manual.yml b/.github/workflows/doc_manual.yml
@@ -13,26 +13,11 @@ jobs:
   # This workflow contains a single job called "greet"
   build_doc_site:
     # The type of runner that the job will run on
-    runs-on: [ ubuntu-22.04-self-hosted ]
+    runs-on: [ doc-builder-22.04 ]
 #    runs-on: [ self-hosted ]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Runs a single command using the runners shell
-    - name: Show auth
-      run: gcloud auth list
-    - name: store secrets file
-      run: |
-          cat << EOF > /tmp/key.json
-          ${{ secrets.SERVICE_ACCOUNT_KEY }}
-          EOF
-    - name: activate service account
-      run: gcloud auth activate-service-account --key-file=/tmp/key.json
-    - name: Show auth
-      run: gcloud auth list
-    - name: Trigger doc build
-      run: gcloud run jobs execute pu-cdn-build-doc-job-production --region europe-north1 --wait
-    - name: Remove service account
-      run: gcloud auth revoke
-    - name: Remove access key file
-      run: rm -f /tmp/key.json
+      # Runs a single command using the runners shell
+      - name: Build_web
+        run: /scripts/build_doc.sh
diff --git a/.github/workflows/web_build.yml b/.github/workflows/web_build.yml
@@ -7,31 +7,16 @@ on:
   push:
     branches:
       - master
-      - automation
 jobs:
   # This workflow contains a single job called "greet"
   build_web_site:
     # The type of runner that the job will run on
-    runs-on: [ ubuntu-22.04-self-hosted ]
+    runs-on: [ web-builder-22.04 ]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Runs a single command using the runners shell
-      - name: Show available accounts
-        run: gcloud auth list
-      - name: Store service account key file
-        run: |
-          cat << EOF > /tmp/key.json
-          ${{ secrets.SERVICE_ACCOUNT_KEY }}
-          EOF
-      - name: Activate service account
-        run: gcloud auth activate-service-account --key-file=/tmp/key.json
-      - name: Show available accounts
-        run: gcloud auth list
-      - name: Trigger web build
-        run: gcloud run jobs execute pu-cdn-build-web-job-production --region europe-north1 --wait
-      - name: Remove service account
-        run: gcloud auth revoke
-      - name: Remove service account key file
-        run: rm -f /tmp/key.json
+      - name: Build_web
+        run: /scripts/build_web.sh
+