Merge 371f566 into 47656e6

yext · Jan 28, 2022 · fae8193 · fae8193
2 parents 47656e6 + 371f566
commit fae8193
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 69 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -147,7 +147,7 @@ jobs:
           name: Verify translation files
           command: |
             sudo apt-get install -qq gettext
-            ./.circleci/run_translation_verification.sh
+            ./.github/run_translation_verification.sh
   # deploys assets to an uncached folder in the S3 bucket named by branch
   deploy_branch:
     docker:

diff --git a/.circleci/run_translation_verification.sh → .github/run_translation_verification.sh b/.circleci/run_translation_verification.sh → .github/run_translation_verification.sh
@@ -16,14 +16,7 @@ fi
 
 # Verify that translations are present for all languages
 cd conf/i18n/translations
-if [[ $CIRCLE_BRANCH == release/*
-  || $CIRCLE_BRANCH == hotfix/*
-  || $CIRCLE_BRANCH == master
-  || $CIRCLE_BRANCH == support/* ]]
-then
-  for po_file in *.po
-    do msgcmp $po_file messages.pot
-  done
-else
-  echo "Skipping the verification that all translations are present"
-fi
+
+for po_file in *.po
+  do msgcmp $po_file messages.pot
+done
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -5,49 +5,52 @@ on:
     branches-ignore:
       - develop
       - master
-      - support/**
+      # - support/**
       - hotfix/**
       - feature/**-i18n
       - release/**
 
 jobs:
-  call_build:
-    uses: ./.github/workflows/build.yml
+  # call_build:
+  #   uses: ./.github/workflows/build.yml
 
-  call_unit_test:
-    uses: ./.github/workflows/unit_test.yml
-    needs: call_build
+  # call_unit_test:
+  #   uses: ./.github/workflows/unit_test.yml
+  #   needs: call_build
+
+  call_misc_tests:
+    uses: ./.github/workflows/miscellaneous_tests.yml
 
-  call_acceptance:
-    uses: ./.github/workflows/acceptance.yml
-    needs: call_build
-    secrets:
-      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+  # call_acceptance:
+  #   uses: ./.github/workflows/acceptance.yml
+  #   needs: call_build
+  #   secrets:
+  #     BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+  #     BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
 
-  format_branch_name:
-    runs-on: ubuntu-latest
-    outputs:
-      formatted_branch: ${{ steps.vars.outputs.formatted_branch }}
-    steps:
-      - name: Format branch name # replace '/' with '-'
-        id: vars
-        run: |
-          FORMATTED_BRANCH="$(echo ${GITHUB_REF_NAME} | sed "s/\//-/g")" 
-          echo $FORMATTED_BRANCH
-          echo ::set-output name=formatted_branch::${FORMATTED_BRANCH}
+  # format_branch_name:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     formatted_branch: ${{ steps.vars.outputs.formatted_branch }}
+  #   steps:
+  #     - name: Format branch name # replace '/' with '-'
+  #       id: vars
+  #       run: |
+  #         FORMATTED_BRANCH="$(echo ${GITHUB_REF_NAME} | sed "s/\//-/g")" 
+  #         echo $FORMATTED_BRANCH
+  #         echo ::set-output name=formatted_branch::${FORMATTED_BRANCH}
 
-  call_deploy:
-    needs: 
-      - call_unit_test
-      - format_branch_name
-      - call_acceptance
-    uses: ./.github/workflows/deploy.yml
-    with:
-      directory: dev/${{ needs.format_branch_name.outputs.formatted_branch }}
-    secrets:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  # call_deploy:
+  #   needs: 
+  #     - call_unit_test
+  #     - format_branch_name
+  #     - call_acceptance
+  #   uses: ./.github/workflows/deploy.yml
+  #   with:
+  #     directory: dev/${{ needs.format_branch_name.outputs.formatted_branch }}
+  #   secrets:
+  #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
 concurrency:
   group: ci-build-and-deploy-${{ github.ref }}-1

diff --git a/.github/workflows/miscellaneous_tests.yml b/.github/workflows/miscellaneous_tests.yml
@@ -0,0 +1,19 @@
+name: Run miscellaneous tests
+
+on:
+  workflow_call:
+
+jobs:
+  unit_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          cache: 'npm'
+      - run: npm ci
+      - run: sudo apt-get install -qq gettext
+      - run: ./.github/run_translation_verification.sh
diff --git a/.github/workflows/percy_snapshots.yml b/.github/workflows/percy_snapshots.yml
@@ -20,9 +20,9 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run build
-    - name: Percy Snapshots
-      run: npx percy exec -- node tests/acceptance/percy/snapshots.js
-      env:
-        PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
+    # - run: npm ci
+    # - run: npm run build
+    # - name: Percy Snapshots
+    #   run: npx percy exec -- node tests/acceptance/percy/snapshots.js
+    #   env:
+    #     PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
diff --git a/conf/i18n/translations/ar.po b/conf/i18n/translations/ar.po
@@ -162,16 +162,6 @@ msgstr "شكرًا على ملاحظاتك!"
 msgid "Thank you for your question!"
 msgstr "شكرا لك على سؤالك!"
 
-#: src/ui/templates/results/alternativeverticals.hbs:11
-msgid "The following search category yielded results for <span class=\"yxt-AlternativeVerticals-details--query\">\"[[query]]\"</span>:"
-msgid_plural "The following search categories yielded results for <span class=\"yxt-AlternativeVerticals-details--query\">\"[[query]]\"</span>:"
-msgstr[0] "أسفرت فئات البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-msgstr[1] "أسفرت فئة البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-msgstr[2] "أسفرت فئات البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-msgstr[3] "أسفرت فئات البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-msgstr[4] "أسفرت فئات البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-msgstr[5] "أسفرت فئات البحث التالية عن نتائج لعدد <span class=\"yxt-AlternativeVerticals-details--query\">&quot;[[query]]&quot;</span>:"
-
 #: src/ui/components/results/directanswercomponent.js:23
 msgid "This answered my question"
 msgstr "هذا أجاب عن سؤالي"

diff --git a/conf/i18n/translations/es.po b/conf/i18n/translations/es.po
@@ -216,9 +216,6 @@ msgstr "Sugerencias:"
 msgid "Thank you for your feedback!"
 msgstr "Gracias por su comentario"
 
-#: src/ui/components/questions/questionsubmissioncomponent.js:127
-msgid "Thank you for your question!"
-msgstr "Gracias por su pregunta."
 
 #: src/ui/templates/results/alternativeverticals.hbs:11
 msgid "The following search category yielded results for <span class=\"yxt-AlternativeVerticals-details--query\">\"[[query]]\"</span>:"

diff --git a/conf/i18n/translations/fr.po b/conf/i18n/translations/fr.po
@@ -201,10 +201,6 @@ msgstr "Voici <em class=\"yxt-AlternativeVerticals-noResultsInfo--emphasized\">
 msgid "Speech Recognition is not available."
 msgstr "La reconnaissance vocale n'est pas disponible."
 
-#: src/ui/templates/results/noresults.hbs:24
-msgid "Suggestions:"
-msgstr "Suggestions:"
-
 #: src/ui/components/results/directanswercomponent.js:29
 msgid "Thank you for your feedback!"
 msgstr "Merci pour vos retours !"