fixing upload

mountain-pass · Aug 9, 2024 · 86ce79d · 86ce79d
1 parent 8e4cc0e
commit 86ce79d
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 35 deletions.
diff --git a/.github/workflows/update-act.yml b/.github/workflows/update-act.yml
@@ -2,7 +2,7 @@ name: Update Data for ACT
 
 on:
   schedule:
-    - cron: '23 01 01 3,6,9,12 *'
+    - cron: '28 01 01 3,6,9,12 *'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/update-nsw.yml b/.github/workflows/update-nsw.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: NSW
diff --git a/.github/workflows/update-nt.yml b/.github/workflows/update-nt.yml
@@ -2,11 +2,15 @@ name: Update Data for NT
 
 on:
   schedule:
-    - cron: '23 01 01 3,6,9,12 *'
+    - cron: '35 01 01 3,6,9,12 *'
   workflow_dispatch:
 
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: NT
diff --git a/.github/workflows/update-ot.yml b/.github/workflows/update-ot.yml
@@ -6,36 +6,11 @@ on:
   workflow_dispatch:
 
 jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16' # Specify the Node.js version you need
-
-      - name: Upload
-        env:
-          ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
-          ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
-          ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
-          ELASTIC_PORT: 443
-          ELASTIC_PROTOCOL: https
-          NODE_ENV: production
-          ADDRESSR_ENABLE_GEO: 1
-          DEBUG: error,api,express:*,swagger-tools*,test,es
-        run: |
-          set -x
-          npm run gen-install-cmd
-          chmod +x ./install.sh
-          ./install.sh
-          env | grep -E '^(ELASTIC)_'
-          COVERED_STATES=OT NODE_OPTIONS=--max_old_space_size=8196 addressr-loader
-          set +x
-
-  # call-reusable-workflow:
-  #   uses: ./.github/workflows/reusable-update.yml
-  #   with:
-  #     state: OT
+  call-reusable-workflow:
+    uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
+    with:
+      state: OT
diff --git a/.github/workflows/update-qld.yml b/.github/workflows/update-qld.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: QLD
diff --git a/.github/workflows/update-sa.yml b/.github/workflows/update-sa.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: SA
diff --git a/.github/workflows/update-tas.yml b/.github/workflows/update-tas.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: TAS
diff --git a/.github/workflows/update-vic.yml b/.github/workflows/update-vic.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: VIC
diff --git a/.github/workflows/update-wa.yml b/.github/workflows/update-wa.yml
@@ -8,5 +8,9 @@ on:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-update.yml
+    secrets:
+      TF_VAR_ELASTIC_HOST: ${{ secrets.TF_VAR_ELASTIC_HOST }}
+      TF_VAR_ELASTIC_PASSWORD: ${{ secrets.TF_VAR_ELASTIC_PASSWORD }}
+      TF_VAR_ELASTIC_USERNAME: ${{ secrets.TF_VAR_ELASTIC_USERNAME }}
     with:
       state: WA