From 63ccf8e87cda38b0584dc3db53ef793b8a480879 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 14 Sep 2021 12:03:36 -0700 Subject: [PATCH 1/5] trying to find the browser artifacts --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b091820ab3..5c72023966 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,32 +109,41 @@ jobs: - name: Gulp run: gulp ci + - name: Try to find the zips + run: | + ls -atlh dist + - name: Upload Opera artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-opera-${{ env._BUILD_NUMBER }}.zip path: dist/dist-opera-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error - name: Upload Chrome artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-chrome-${{ env._BUILD_NUMBER }}.zip path: dist/dist-chrome-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error - name: Upload Firefox artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-firefox-${{ env._BUILD_NUMBER }}.zip path: dist/dist-firefox-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error - name: Upload Edge artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-edge-${{ env._BUILD_NUMBER }}.zip path: dist/dist-edge-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error - name: Upload coverage artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: coverage-${{ env._BUILD_NUMBER }}.zip path: coverage/coverage-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error From 57926b71a92fb59e39207d1036d6651996c88379 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 14 Sep 2021 12:25:20 -0700 Subject: [PATCH 2/5] switching to pwsh --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c72023966..92c4ff329c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: - name: Try to find the zips run: | - ls -atlh dist + ls dist - name: Upload Opera artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 From 66a4cfe089b5b925158442a3ce750f3875f075ca Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 14 Sep 2021 12:46:25 -0700 Subject: [PATCH 3/5] fixing dist names --- ' | 149 ++++++++++++++++++++++++++++++++++++ .github/workflows/build.yml | 11 +-- 2 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 ' diff --git a/' b/' new file mode 100644 index 0000000000..2d206524b4 --- /dev/null +++ b/' @@ -0,0 +1,149 @@ +--- +name: Build + +on: + push: + branches-ignore: + - 'l10n_master' + workflow_dispatch: + inputs: + + +jobs: + cloc: + name: CLOC + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + + - name: Set up cloc + run: | + sudo apt update + sudo apt -y install cloc + - name: Print lines of code + run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git + + + setup: + name: Setup + runs-on: ubuntu-latest + outputs: + repo_url: ${{ steps.gen_vars.outputs.repo_url }} + adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} + steps: + - name: Checkout repo + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + + - name: Get Package Version + id: gen_vars + run: | + repo_url=https://github.com/$GITHUB_REPOSITORY.git + adj_build_num=${GITHUB_SHA:0:7} + + echo "::set-output name=repo_url::$repo_url" + echo "::set-output name=adj_build_number::$adj_build_num" + + locales-test: + name: Locales Test + runs-on: ubuntu-latest + needs: setup + steps: + - name: Checkout repo + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + + - name: Testing locales - extName length + run: | + found_error=false + + echo "Locales Test" + echo "============" + echo "extName string must be 40 characters or less" + echo + for locale in $(ls src/_locales/); do + string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json) + if [[ $string_length -gt 40 ]]; then + echo "$locale: $string_length" + found_error=true + fi + done + + if $found_error; then + echo + echo "Please fix 'extName' for the locales listed above." + exit 1 + else + echo "Test passed!" + fi + + build: + name: Build + runs-on: windows-latest + needs: [setup, locales-test] + env: + _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} + steps: + - name: Checkout repo + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + + - name: Set up Node + uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea + with: + node-version: '14' + + - name: Update NPM + run: | + npm install -g npm@7 + + - name: Print environment + run: | + node --version + npm --version + + - name: NPM setup & test + run: | + npm install + npm run dist + npm run test + + - name: Gulp + run: gulp ci + + - name: Try to find the zips + run: | + ls dist + + - name: Upload Opera artifact + uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 + with: + name: dist-opera-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-opera.zip + if-no-files-found: error + + - name: Upload Chrome artifact + uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 + with: + name: dist-chrome-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-chrome.zip + if-no-files-found: error + + - name: Upload Firefox artifact + uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 + with: + name: dist-firefox-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-firefox.zip + if-no-files-found: error + + - name: Upload Edge artifact + uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 + with: + name: dist-edge-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-edge.zip + if-no-files-found: error + + - name: Upload coverage artifact + uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 + with: + name: coverage-${{ env._BUILD_NUMBER }}.zip + path: coverage/coverage-${{ env._BUILD_NUMBER }}.zip + if-no-files-found: error diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92c4ff329c..ca1cfe43f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,34 +111,35 @@ jobs: - name: Try to find the zips run: | - ls dist + ls + ls coverage - name: Upload Opera artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-opera-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-opera-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-opera.zip if-no-files-found: error - name: Upload Chrome artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-chrome-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-chrome-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-chrome.zip if-no-files-found: error - name: Upload Firefox artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-firefox-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-firefox-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-firefox.zip if-no-files-found: error - name: Upload Edge artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: dist-edge-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-edge-${{ env._BUILD_NUMBER }}.zip + path: dist/dist-edge.zip if-no-files-found: error - name: Upload coverage artifact From 1dd991bef01c921b26f1e38e279154661761797f Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 14 Sep 2021 12:53:25 -0700 Subject: [PATCH 4/5] removing testing code and fixing the release code --- .github/workflows/build.yml | 6 +----- .github/workflows/release.yml | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca1cfe43f8..faf854c524 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,11 +109,6 @@ jobs: - name: Gulp run: gulp ci - - name: Try to find the zips - run: | - ls - ls coverage - - name: Upload Opera artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: @@ -143,6 +138,7 @@ jobs: if-no-files-found: error - name: Upload coverage artifact + if: false uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 with: name: coverage-${{ env._BUILD_NUMBER }}.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bcce70efb3..615a9d37a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -160,7 +160,7 @@ jobs: with: upload_url: ${{ needs.setup.outputs.release_upload_url }} asset_name: dist-opera-${{ env._BUILD_NUMBER }}.zip - asset_path: dist/dist-opera-${{ env._BUILD_NUMBER }}.zip + asset_path: dist/dist-opera.zip asset_content_type: application - name: Upload Chrome release asset @@ -170,7 +170,7 @@ jobs: with: upload_url: ${{ needs.setup.outputs.release_upload_url }} asset_name: dist-chrome-${{ env._BUILD_NUMBER }}.zip - asset_path: dist/dist-chrome-${{ env._BUILD_NUMBER }}.zip + asset_path: dist/dist-chrome.zip asset_content_type: application/zip - name: Upload Firefox release asset @@ -180,7 +180,7 @@ jobs: with: upload_url: ${{ needs.setup.outputs.release_upload_url }} asset_name: dist-firefox-${{ env._BUILD_NUMBER }}.zip - asset_path: dist/dist-firefox-${{ env._BUILD_NUMBER }}.zip + asset_path: dist/dist-firefox.zip asset_content_type: application/zip - name: Upload Edge release asset @@ -190,7 +190,7 @@ jobs: with: upload_url: ${{ needs.setup.outputs.release_upload_url }} asset_name: dist-edge-${{ env._BUILD_NUMBER }}.zip - asset_path: dist/dist-edge-${{ env._BUILD_NUMBER }}.zip + asset_path: dist/dist-edge.zip asset_content_type: application/zip - name: Upload browser source zip release asset From ad0ca7c56f6b24a3ff3b15af0669e096f8cf4722 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 14 Sep 2021 13:23:19 -0700 Subject: [PATCH 5/5] removing the weird file --- ' | 149 -------------------------------------------------------------- 1 file changed, 149 deletions(-) delete mode 100644 ' diff --git a/' b/' deleted file mode 100644 index 2d206524b4..0000000000 --- a/' +++ /dev/null @@ -1,149 +0,0 @@ ---- -name: Build - -on: - push: - branches-ignore: - - 'l10n_master' - workflow_dispatch: - inputs: - - -jobs: - cloc: - name: CLOC - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - - name: Set up cloc - run: | - sudo apt update - sudo apt -y install cloc - - name: Print lines of code - run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git - - - setup: - name: Setup - runs-on: ubuntu-latest - outputs: - repo_url: ${{ steps.gen_vars.outputs.repo_url }} - adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} - steps: - - name: Checkout repo - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - - name: Get Package Version - id: gen_vars - run: | - repo_url=https://github.com/$GITHUB_REPOSITORY.git - adj_build_num=${GITHUB_SHA:0:7} - - echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$adj_build_num" - - locales-test: - name: Locales Test - runs-on: ubuntu-latest - needs: setup - steps: - - name: Checkout repo - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - - name: Testing locales - extName length - run: | - found_error=false - - echo "Locales Test" - echo "============" - echo "extName string must be 40 characters or less" - echo - for locale in $(ls src/_locales/); do - string_length=$(jq '.extName.message | length' src/_locales/$locale/messages.json) - if [[ $string_length -gt 40 ]]; then - echo "$locale: $string_length" - found_error=true - fi - done - - if $found_error; then - echo - echo "Please fix 'extName' for the locales listed above." - exit 1 - else - echo "Test passed!" - fi - - build: - name: Build - runs-on: windows-latest - needs: [setup, locales-test] - env: - _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} - steps: - - name: Checkout repo - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - - name: Set up Node - uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea - with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 - - - name: Print environment - run: | - node --version - npm --version - - - name: NPM setup & test - run: | - npm install - npm run dist - npm run test - - - name: Gulp - run: gulp ci - - - name: Try to find the zips - run: | - ls dist - - - name: Upload Opera artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 - with: - name: dist-opera-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-opera.zip - if-no-files-found: error - - - name: Upload Chrome artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 - with: - name: dist-chrome-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-chrome.zip - if-no-files-found: error - - - name: Upload Firefox artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 - with: - name: dist-firefox-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-firefox.zip - if-no-files-found: error - - - name: Upload Edge artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 - with: - name: dist-edge-${{ env._BUILD_NUMBER }}.zip - path: dist/dist-edge.zip - if-no-files-found: error - - - name: Upload coverage artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 - with: - name: coverage-${{ env._BUILD_NUMBER }}.zip - path: coverage/coverage-${{ env._BUILD_NUMBER }}.zip - if-no-files-found: error