From 16d6be126f9b19f57a97090b5908e550c9bf8bd5 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 15:27:08 -0800 Subject: [PATCH 01/39] initial trial for the browser --- .github/workflows/build.yml | 132 ++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000000..cac59dec32a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,132 @@ +name: Build + +on: + push: + branches-ignore: + - 'l10n_master' + workflow_dispatch: + inputs: + + +jobs: + cloc: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + - 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: + runs-on: ubuntu-latest + outputs: + package_version: ${{ steps.gen_vars.outputs.package_version }} + 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@v2 + + - name: Get Package Version + id: gen_vars + shell: pwsh + run: | + $env:pkgVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).version + $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" + $env:bulid_num = ${env:GITHUB_RUN_NUBMER} + 3000 + + echo "::set-output name=package_version::$env:pkgVersion" + echo "::set-output name=repo_url::$env:repo_url" + echo "::set-output name=adj_build_number::$env:build_num" + + + cli: + runs-on: windows-latest + needs: setup + env: + PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} + REPO_URL: ${{ needs.setup.outputs.repo_url }} + BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + - name: Setup Windows builder + run: | + choco install checksum --no-progress + choco install reshack --no-progress + + - name: Set up Node + uses: actions/setup-node@v1 + with: + node-version: '10.x' + + - name: Print environment + run: | + node --version + npm --version + + - name: Install Gulp + run: npm install -g gulp + + - name: npm setup & test + run: | + npm install + npm run dist + npm run test + + - name: gulp + run: gulp ci + + - name: Build sources for reviewers + run: | + mkdir dist\Source + call git clone --branch=%GITHUB_REF% %REPO_URL% dist\Source + cd dist\Source + call git checkout %GITHUB_SHA% + call git submodule update --init --recursive + cd ../ + del /S/Q "Source\.git\objects\pack\*" + call 7z a browser-source-%RUN_NUMBER%.zip "Source\*" + + - name: Upload opera artifact + uses: actions/upload-artifact@v2 + with: + name: dist-opera-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-opera-${{ env.BUILD_NUMBER}}.zip + + - name: Upload chrome artifact + uses: actions/upload-artifact@v2 + with: + name: dist-chrome-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip + + - name: Upload firefox artifact + uses: actions/upload-artifact@v2 + with: + name: dist-firefox-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip + + - name: Upload edge artifact + uses: actions/upload-artifact@v2 + with: + name: dist-edge-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip + + - name: Upload source artifact + uses: actions/upload-artifact@v2 + with: + name: dist-source-${{ env.BUILD_NUMBER }}.zip + path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip + + - name: Upload opera artifact + uses: actions/upload-artifact@v2 + with: + name: coverage-${{ env.BUILD_NUMBER }}.zip + path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip From 6a1cfce185033aac2988823476f063ea9b5b15e4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 15:30:51 -0800 Subject: [PATCH 02/39] removing the package version since it is not used --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cac59dec32a..8ea996dfdb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,6 @@ jobs: setup: runs-on: ubuntu-latest outputs: - package_version: ${{ steps.gen_vars.outputs.package_version }} repo_url: ${{ steps.gen_vars.outputs.repo_url }} adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} steps: @@ -37,11 +36,9 @@ jobs: id: gen_vars shell: pwsh run: | - $env:pkgVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).version $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $env:bulid_num = ${env:GITHUB_RUN_NUBMER} + 3000 - echo "::set-output name=package_version::$env:pkgVersion" echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" @@ -50,7 +47,6 @@ jobs: runs-on: windows-latest needs: setup env: - PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} REPO_URL: ${{ needs.setup.outputs.repo_url }} BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} steps: From adb84e918f217b4d0ad0998c92f6fdf51aaadf0d Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 15:37:36 -0800 Subject: [PATCH 03/39] commenting out the gulp install --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ea996dfdb9..fa0e22bb0ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,8 +68,8 @@ jobs: node --version npm --version - - name: Install Gulp - run: npm install -g gulp + #- name: Install Gulp + # run: npm install -g gulp - name: npm setup & test run: | From 0ce78fc11bf936c0021b17d0d3c9f335ef536930 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 15:44:53 -0800 Subject: [PATCH 04/39] specifying cmd shell --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa0e22bb0ab..5eb65e35702 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,6 +81,7 @@ jobs: run: gulp ci - name: Build sources for reviewers + shell: cmd run: | mkdir dist\Source call git clone --branch=%GITHUB_REF% %REPO_URL% dist\Source From 1e0fede341ecd2f56a398a099e044e13952222fe Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 15:58:24 -0800 Subject: [PATCH 05/39] debugging dist --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb65e35702..6e7860ddbef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,9 @@ jobs: - name: gulp run: gulp ci + - name: test dist + run: ls dist + - name: Build sources for reviewers shell: cmd run: | From b2f4a7f96e16823f7b0110acbf44bf498beb2da7 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 16:10:13 -0800 Subject: [PATCH 06/39] fixing 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 6e7860ddbef..35d8100e245 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $env:bulid_num = ${env:GITHUB_RUN_NUBMER} + 3000 + $env:bulid_num = $env:GITHUB_RUN_NUBMER + 3000 echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" From 0be634707c273cb450949965011f63b5bc96d804 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 16:24:16 -0800 Subject: [PATCH 07/39] fixing BUILD_NUMBER and dist files --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35d8100e245..42a0e2f142d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $env:bulid_num = $env:GITHUB_RUN_NUBMER + 3000 + $env:bulid_num = $env:GITHUB_RUN_NUMBER + 3000 echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" @@ -99,25 +99,25 @@ jobs: uses: actions/upload-artifact@v2 with: name: dist-opera-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-opera-${{ env.BUILD_NUMBER}}.zip + path: dist/dist-opera.zip - name: Upload chrome artifact uses: actions/upload-artifact@v2 with: name: dist-chrome-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-chrome.zip - name: Upload firefox artifact uses: actions/upload-artifact@v2 with: name: dist-firefox-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-firefox.zip - name: Upload edge artifact uses: actions/upload-artifact@v2 with: name: dist-edge-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-edge.zip - name: Upload source artifact uses: actions/upload-artifact@v2 From 7fe38fb7f1aa365df6a908b4513d96ed3027f6ba Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 16:39:49 -0800 Subject: [PATCH 08/39] debugging the BUILD_NUMBER --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42a0e2f142d..df0688e8ed5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,8 @@ jobs: $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $env:bulid_num = $env:GITHUB_RUN_NUMBER + 3000 + Write-Host $env:build_num + echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" From 0fb119e8eebcbc8d7ffecbbd839e0e811596038a Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 16:42:18 -0800 Subject: [PATCH 09/39] fixing error --- .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 df0688e8ed5..3ab30b39d2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $env:bulid_num = $env:GITHUB_RUN_NUMBER + 3000 - Write-Host $env:build_num + Write-Host "BUILD NUMBER: $env:build_num" echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" From 211eef206e9e5b6826521967e62d1deeeb6bd0c0 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 16:54:52 -0800 Subject: [PATCH 10/39] adding github run number --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ab30b39d2c..a04f19b4055 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ jobs: $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $env:bulid_num = $env:GITHUB_RUN_NUMBER + 3000 + Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $env:build_num" echo "::set-output name=repo_url::$env:repo_url" From fc53f498dd4a52a1b206ae7c472115b7738af230 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 1 Feb 2021 17:05:39 -0800 Subject: [PATCH 11/39] trying another powershell thing --- .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 a04f19b4055..405ad2ac042 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $env:bulid_num = $env:GITHUB_RUN_NUMBER + 3000 + $env:bulid_num = "${env:GITHUB_RUN_NUMBER + 3000}" Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $env:build_num" From f332116dcb97099c7eaff794754d078aeb7211fb Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 07:45:30 -0800 Subject: [PATCH 12/39] casting run number to int --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 405ad2ac042..97aaa2743d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $env:bulid_num = "${env:GITHUB_RUN_NUMBER + 3000}" + $env:bulid_num = [int]$env:GITHUB_RUN_NUMBER + 3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $env:build_num" @@ -45,6 +45,8 @@ jobs: echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" + exit 1 + cli: runs-on: windows-latest From 4f53eddfbaff4a621f076a543d3246a4a56d0bac Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 07:48:07 -0800 Subject: [PATCH 13/39] build_num isn't a env var... --- .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 97aaa2743d5..fe39dee343a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: $env:bulid_num = [int]$env:GITHUB_RUN_NUMBER + 3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" - Write-Host "BUILD NUMBER: $env:build_num" + Write-Host "BUILD NUMBER: $build_num" echo "::set-output name=repo_url::$env:repo_url" echo "::set-output name=adj_build_number::$env:build_num" From 910e64324d92215c2ce7a6b775c7880e641abd1d Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 07:49:57 -0800 Subject: [PATCH 14/39] the other vars aren't env either --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe39dee343a..3eceb2fbd42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,14 +36,14 @@ jobs: id: gen_vars shell: pwsh run: | - $env:repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $env:bulid_num = [int]$env:GITHUB_RUN_NUMBER + 3000 + $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" + $bulid_num = [int]$env:GITHUB_RUN_NUMBER + 3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" - echo "::set-output name=repo_url::$env:repo_url" - echo "::set-output name=adj_build_number::$env:build_num" + echo "::set-output name=repo_url::$repo_url" + echo "::set-output name=adj_build_number::$build_num" exit 1 From 83254796304d5ad3ebbed5afa9bb91c2ab1488a8 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:07:22 -0800 Subject: [PATCH 15/39] more debugging --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3eceb2fbd42..543b5a5a804 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,8 @@ jobs: Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" + Write-Host "============================" + $env:GITHUB_RUN_NUMBER.gettype() echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$build_num" From 1d567e560f3a74ded4e4a5c64ce45006247d3f99 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:08:33 -0800 Subject: [PATCH 16/39] testing int casting --- .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 543b5a5a804..5023e93152b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" Write-Host "============================" - $env:GITHUB_RUN_NUMBER.gettype() + [int]$env:GITHUB_RUN_NUMBER.gettype() echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$build_num" From 29f61f0c469f851b4a01fc46ed4b481ca16afe54 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:16:03 -0800 Subject: [PATCH 17/39] more debugging --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5023e93152b..f41b82809cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,15 +37,18 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $bulid_num = [int]$env:GITHUB_RUN_NUMBER + 3000 + $bulid_num = [int]$env:GITHUB_RUN_NUMBER + $adj_build_num = $buildnum+3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" + Write-Host "ADJUSTED BUILD NUMBER: $adj_build_num" Write-Host "============================" - [int]$env:GITHUB_RUN_NUMBER.gettype() + $build_num.gettype() + $adj_build_num.gettype() echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$build_num" + echo "::set-output name=adj_build_number::$adj_build_num" exit 1 From c22c0dae29f77a69ad3da2a73b8830232f24a602 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:17:55 -0800 Subject: [PATCH 18/39] testing env saving? --- .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 f41b82809cc..bfaa6a49009 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $bulid_num = [int]$env:GITHUB_RUN_NUMBER + $bulid_num = $env:GITHUB_RUN_NUMBER $adj_build_num = $buildnum+3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" From 504142cd5d6fe25037468ac4abe7629d7317d7e3 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:20:13 -0800 Subject: [PATCH 19/39] wet spaghetti... --- .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 bfaa6a49009..2df0abe3485 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $bulid_num = $env:GITHUB_RUN_NUMBER + $bulid_num = $GITHUB_RUN_NUMBER $adj_build_num = $buildnum+3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" From 9f8754e6b3dccf5979c44ab32a24afe6b44ec83a Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:23:48 -0800 Subject: [PATCH 20/39] fixing the typo................ --- .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 2df0abe3485..ec5169fae29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $bulid_num = $GITHUB_RUN_NUMBER + $build_num = [int]$env:GITHUB_RUN_NUMBER $adj_build_num = $buildnum+3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" From 7d1195a66ca1eeda867fd3d7e87dde92e39bc5d4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 08:31:06 -0800 Subject: [PATCH 21/39] got the int. trying the math --- .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 ec5169fae29..36bcbcadc0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $build_num = [int]$env:GITHUB_RUN_NUMBER - $adj_build_num = $buildnum+3000 + $adj_build_num = $buildnum + 3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" From 06c82a59405fad2344e33bde36f89dfb7e4201b4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 09:30:56 -0800 Subject: [PATCH 22/39] fixing var name --- .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 36bcbcadc0d..48f3103dc17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" $build_num = [int]$env:GITHUB_RUN_NUMBER - $adj_build_num = $buildnum + 3000 + $adj_build_num = $build_num + 3000 Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" Write-Host "BUILD NUMBER: $build_num" From 9cb418e290c09c39b3a38adff99872e07b53eb54 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 09:38:03 -0800 Subject: [PATCH 23/39] hopefully we have a working solution --- .github/workflows/build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48f3103dc17..2251932e18a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,18 +40,9 @@ jobs: $build_num = [int]$env:GITHUB_RUN_NUMBER $adj_build_num = $build_num + 3000 - Write-Host "RUN NUMBER: $env:GITHUB_RUN_NUMBER" - Write-Host "BUILD NUMBER: $build_num" - Write-Host "ADJUSTED BUILD NUMBER: $adj_build_num" - Write-Host "============================" - $build_num.gettype() - $adj_build_num.gettype() - echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$adj_build_num" - exit 1 - cli: runs-on: windows-latest From 6198b6d884a7efb294a415db33ce06522140289c Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 09:48:25 -0800 Subject: [PATCH 24/39] adding the build number back into the file name for upload --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2251932e18a..59a6f91549c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,25 +100,25 @@ jobs: uses: actions/upload-artifact@v2 with: name: dist-opera-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-opera.zip + path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip - name: Upload chrome artifact uses: actions/upload-artifact@v2 with: name: dist-chrome-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-chrome.zip + path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip - name: Upload firefox artifact uses: actions/upload-artifact@v2 with: name: dist-firefox-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-firefox.zip + path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip - name: Upload edge artifact uses: actions/upload-artifact@v2 with: name: dist-edge-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-edge.zip + path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip - name: Upload source artifact uses: actions/upload-artifact@v2 From e4b01afdfc775cc8f0c0de45320e8f4b5791d7d4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 09:56:34 -0800 Subject: [PATCH 25/39] moving the test task below the source building --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59a6f91549c..3413aa5f572 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,9 +81,6 @@ jobs: - name: gulp run: gulp ci - - name: test dist - run: ls dist - - name: Build sources for reviewers shell: cmd run: | @@ -96,6 +93,9 @@ jobs: del /S/Q "Source\.git\objects\pack\*" call 7z a browser-source-%RUN_NUMBER%.zip "Source\*" + - name: test dist + run: ls dist + - name: Upload opera artifact uses: actions/upload-artifact@v2 with: From 52a76bda5ce7e0a708b223d22b24de2373fd34fe Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 12:00:03 -0800 Subject: [PATCH 26/39] fixing the source build number --- .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 3413aa5f572..3961b4f3843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,7 @@ jobs: call git submodule update --init --recursive cd ../ del /S/Q "Source\.git\objects\pack\*" - call 7z a browser-source-%RUN_NUMBER%.zip "Source\*" + call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*" - name: test dist run: ls dist From 4ee0675d36af3116aebe4134fcaf2199c529d3b9 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 12:14:33 -0800 Subject: [PATCH 27/39] testing new setup --- .github/workflows/build.yml | 7 +- .github/workflows/release.yml | 133 ++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3961b4f3843..07285e5262f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,11 @@ jobs: id: gen_vars shell: pwsh run: | - $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $build_num = [int]$env:GITHUB_RUN_NUMBER - $adj_build_num = $build_num + 3000 + repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" + build_num=$(${{ env.GITHUB_RUN_NUMBER }} + 3000) echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$adj_build_num" + echo "::set-output name=adj_build_number::$build_num" cli: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000000..03f4791cf00 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,133 @@ +name: Release + +on: + workflow_dispatch: + inputs: + release_tag_name_input: + description: 'Release Tag Name ' + required: true + + +jobs: + cloc: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + - 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: + 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@v2 + + - name: Get Package Version + id: gen_vars + shell: pwsh + run: | + $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" + $build_num = [int]$env:GITHUB_RUN_NUMBER + $adj_build_num = $build_num + 3000 + + echo "::set-output name=repo_url::$repo_url" + echo "::set-output name=adj_build_number::$adj_build_num" + + + cli: + runs-on: windows-latest + needs: setup + env: + REPO_URL: ${{ needs.setup.outputs.repo_url }} + BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + - name: Setup Windows builder + run: | + choco install checksum --no-progress + choco install reshack --no-progress + + - name: Set up Node + uses: actions/setup-node@v1 + with: + node-version: '10.x' + + - name: Print environment + run: | + node --version + npm --version + + #- name: Install Gulp + # run: npm install -g gulp + + - name: npm setup & test + run: | + npm install + npm run dist + npm run test + + - name: gulp + run: gulp ci + + - name: Build sources for reviewers + shell: cmd + run: | + mkdir dist\Source + call git clone --branch=%GITHUB_REF% %REPO_URL% dist\Source + cd dist\Source + call git checkout %GITHUB_SHA% + call git submodule update --init --recursive + cd ../ + del /S/Q "Source\.git\objects\pack\*" + call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*" + + - name: test dist + run: ls dist + + - name: Upload opera artifact + uses: actions/upload-artifact@v2 + with: + name: dist-opera-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip + + - name: Upload chrome artifact + uses: actions/upload-artifact@v2 + with: + name: dist-chrome-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip + + - name: Upload firefox artifact + uses: actions/upload-artifact@v2 + with: + name: dist-firefox-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip + + - name: Upload edge artifact + uses: actions/upload-artifact@v2 + with: + name: dist-edge-${{ env.BUILD_NUMBER }}.zip + path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip + + - name: Upload source artifact + uses: actions/upload-artifact@v2 + with: + name: dist-source-${{ env.BUILD_NUMBER }}.zip + path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip + + - name: Upload opera artifact + uses: actions/upload-artifact@v2 + with: + name: coverage-${{ env.BUILD_NUMBER }}.zip + path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip From a9fee411747c8ba26778247d92ee300f66d2caca Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 12:15:33 -0800 Subject: [PATCH 28/39] fixing shell --- .github/workflows/build.yml | 1 - .github/workflows/release.yml | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07285e5262f..3d73f711a97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,6 @@ jobs: - name: Get Package Version id: gen_vars - shell: pwsh run: | repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" build_num=$(${{ env.GITHUB_RUN_NUMBER }} + 3000) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03f4791cf00..1c078382187 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,14 +34,12 @@ jobs: - name: Get Package Version id: gen_vars - shell: pwsh run: | - $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $build_num = [int]$env:GITHUB_RUN_NUMBER - $adj_build_num = $build_num + 3000 + repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" + build_num=$(${{ env.GITHUB_RUN_NUMBER }} + 3000) echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$adj_build_num" + echo "::set-output name=adj_build_number::$build_num" cli: From cbcc12f450ce7315b74a52b22a501f0a3d97f862 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 12:16:33 -0800 Subject: [PATCH 29/39] adding in expr --- .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 3d73f711a97..d834c891716 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: id: gen_vars run: | repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" - build_num=$(${{ env.GITHUB_RUN_NUMBER }} + 3000) + build_num=$(expr ${{ env.GITHUB_RUN_NUMBER }} + 3000) echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$build_num" From 92ea3f7820439065712760f087d5dae945b2e6bb Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 12:24:12 -0800 Subject: [PATCH 30/39] revertting --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d834c891716..3961b4f3843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,12 +34,14 @@ jobs: - name: Get Package Version id: gen_vars + shell: pwsh run: | - repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" - build_num=$(expr ${{ env.GITHUB_RUN_NUMBER }} + 3000) + $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" + $build_num = [int]$env:GITHUB_RUN_NUMBER + $adj_build_num = $build_num + 3000 echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$build_num" + echo "::set-output name=adj_build_number::$adj_build_num" cli: From bd26cdf41be32c4be8481e03a28fe5dd008eeb84 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 13:27:15 -0800 Subject: [PATCH 31/39] initial run of the release --- .github/workflows/build.yml | 27 +------- .github/workflows/release.yml | 125 +++++++++++++++++++++++++--------- 2 files changed, 93 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3961b4f3843..ec90ce21bf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $build_num = [int]$env:GITHUB_RUN_NUMBER - $adj_build_num = $build_num + 3000 + $adj_build_num = "latest" echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$adj_build_num" @@ -69,9 +68,6 @@ jobs: node --version npm --version - #- name: Install Gulp - # run: npm install -g gulp - - name: npm setup & test run: | npm install @@ -80,19 +76,6 @@ jobs: - name: gulp run: gulp ci - - - name: Build sources for reviewers - shell: cmd - run: | - mkdir dist\Source - call git clone --branch=%GITHUB_REF% %REPO_URL% dist\Source - cd dist\Source - call git checkout %GITHUB_SHA% - call git submodule update --init --recursive - cd ../ - del /S/Q "Source\.git\objects\pack\*" - call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*" - - name: test dist run: ls dist @@ -120,13 +103,7 @@ jobs: name: dist-edge-${{ env.BUILD_NUMBER }}.zip path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip - - name: Upload source artifact - uses: actions/upload-artifact@v2 - with: - name: dist-source-${{ env.BUILD_NUMBER }}.zip - path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip - - - name: Upload opera artifact + - name: Upload coverage artifact uses: actions/upload-artifact@v2 with: name: coverage-${{ env.BUILD_NUMBER }}.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c078382187..41cad45738a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,11 +1,11 @@ -name: Release +name: Build on: + push: + branches-ignore: + - 'l10n_master' workflow_dispatch: inputs: - release_tag_name_input: - description: 'Release Tag Name ' - required: true jobs: @@ -26,6 +26,8 @@ jobs: setup: runs-on: ubuntu-latest outputs: + tag_version: ${{ steps.create_tags.outputs.tag_version }} + release_upload_url: ${{ steps.create_release.outputs.upload_url }} repo_url: ${{ steps.gen_vars.outputs.repo_url }} adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} steps: @@ -34,12 +36,46 @@ jobs: - name: Get Package Version id: gen_vars + shell: pwsh run: | - repo_url="https://github.com/${{ env.GITHUB_REPOSITORY }}.git" - build_num=$(${{ env.GITHUB_RUN_NUMBER }} + 3000) + $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" + $build_num = [int]$env:GITHUB_RUN_NUMBER + $adj_build_num = $build_num + 3000 echo "::set-output name=repo_url::$repo_url" - echo "::set-output name=adj_build_number::$build_num" + echo "::set-output name=adj_build_number::$adj_build_num" + + - name: Create Release Vars + id: create_tags + run: | + case "${RELEASE_TAG_NAME_INPUT:0:1}" in + v) + echo "RELEASE_NAME=${RELEASE_TAG_NAME_INPUT:1}" >> $GITHUB_ENV + echo "RELEASE_TAG_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV + echo "::set-output name=tag_version::$RELEASE_TAG_NAME_INPUT" + ;; + [0-9]) + echo "RELEASE_NAME=$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV + echo "RELEASE_TAG_NAME=v$RELEASE_TAG_NAME_INPUT" >> $GITHUB_ENV + echo "::set-output name=tag_version::v$RELEASE_TAG_NAME_INPUT" + ;; + *) + exit 1 + ;; + esac + env: + RELEASE_TAG_NAME_INPUT: ${{ github.event.inputs.release_tag_name_input }} + + - name: Create Draft Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.RELEASE_TAG_NAME }} + release_name: ${{ env.RELEASE_NAME }} + draft: true + prerelease: false cli: @@ -67,9 +103,6 @@ jobs: node --version npm --version - #- name: Install Gulp - # run: npm install -g gulp - - name: npm setup & test run: | npm install @@ -94,38 +127,62 @@ jobs: - name: test dist run: ls dist - - name: Upload opera artifact - uses: actions/upload-artifact@v2 + - name: Upload opera release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: dist-opera-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip + 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_content_type: application - - name: Upload chrome artifact - uses: actions/upload-artifact@v2 + - name: upload chrome release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: dist-chrome-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip + 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_content_type: application/zip - - name: Upload firefox artifact - uses: actions/upload-artifact@v2 + - name: upload firefox release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: dist-firefox-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip + 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_content_type: application/zip - - name: Upload edge artifact - uses: actions/upload-artifact@v2 + - name: upload edge release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: dist-edge-${{ env.BUILD_NUMBER }}.zip - path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip + 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_content_type: application/zip - - name: Upload source artifact - uses: actions/upload-artifact@v2 + - name: upload browser source zip release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: dist-source-${{ env.BUILD_NUMBER }}.zip - path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip + upload_url: ${{ needs.setup.outputs.release_upload_url }} + asset_name: dist-source-${{ env.BUILD_NUMBER }}.zip + asset_path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip + asset_content_type: application/zip - - name: Upload opera artifact - uses: actions/upload-artifact@v2 + - name: upload coverage release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: coverage-${{ env.BUILD_NUMBER }}.zip - path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip + upload_url: ${{ needs.setup.outputs.release_upload_url }} + asset_name: coverage-${{ env.BUILD_NUMBER }}.zip + asset_path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip + asset_content_type: application/zip From 98c7186a78590f16f85f94a2d844a3800ef103ce Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 13:32:27 -0800 Subject: [PATCH 32/39] fixing release trigger --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41cad45738a..a6c2dcb7977 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,11 +1,11 @@ -name: Build +name: Release on: - push: - branches-ignore: - - 'l10n_master' workflow_dispatch: inputs: + release_tag_name_input: + description: "Release Tag Name " + required: true jobs: From 2c23ed74a09928e742a928dc206d1625d74e3585 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 13:49:26 -0800 Subject: [PATCH 33/39] fixing browser-source zip name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6c2dcb7977..9995d0468ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -173,7 +173,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: dist-source-${{ env.BUILD_NUMBER }}.zip + asset_name: browser-source-${{ env.BUILD_NUMBER }}.zip asset_path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip asset_content_type: application/zip From d2211db2667db7df85c92aec7494a7c0b56c2dd1 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 14:17:43 -0800 Subject: [PATCH 34/39] switching latest to the commit hash --- .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 ec90ce21bf3..387e6a56a17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $adj_build_num = "latest" + $adj_build_num = "${{ env.GITHUB_SHA }}" echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$adj_build_num" From 09160877b269ca572f0490e9498e2228749ed148 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 14:23:23 -0800 Subject: [PATCH 35/39] testing sha again --- .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 387e6a56a17..e3604c3d639 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: shell: pwsh run: | $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $adj_build_num = "${{ env.GITHUB_SHA }}" + $adj_build_num = "${env:GITHUB_SHA}" echo "::set-output name=repo_url::$repo_url" echo "::set-output name=adj_build_number::$adj_build_num" From fb5511b4bf2c195ea1017b417f7645ee259ba98c Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 14:26:51 -0800 Subject: [PATCH 36/39] testing shorter sha --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3604c3d639..1bdb9b5bf4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,9 @@ jobs: - name: Get Package Version id: gen_vars - shell: pwsh run: | - $repo_url = "https://github.com/${env:GITHUB_REPOSITORY}.git" - $adj_build_num = "${env:GITHUB_SHA}" + $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" From e2000d0eb9a517750fe73334c420761e101de143 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 2 Feb 2021 14:27:29 -0800 Subject: [PATCH 37/39] fixing bash --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bdb9b5bf4a..9a9447964a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,8 @@ jobs: - name: Get Package Version id: gen_vars run: | - $repo_url = "https://github.com/$GITHUB_REPOSITORY.git" - $adj_build_num = "${GITHUB_SHA:0:7}" + 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" From e4411a3e934691bc12fe31f8cee95bdf8ee2ac1e Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 3 Feb 2021 09:19:41 -0800 Subject: [PATCH 38/39] renaming the main build task and removing uneeded windows builder setup --- .github/workflows/build.yml | 7 +------ .github/workflows/release.yml | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a9447964a3..8e0741d4788 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: echo "::set-output name=adj_build_number::$adj_build_num" - cli: + browser: runs-on: windows-latest needs: setup env: @@ -52,11 +52,6 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - - name: Setup Windows builder - run: | - choco install checksum --no-progress - choco install reshack --no-progress - - name: Set up Node uses: actions/setup-node@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9995d0468ee..f2a7e84f958 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,7 +78,7 @@ jobs: prerelease: false - cli: + browser: runs-on: windows-latest needs: setup env: @@ -88,11 +88,6 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - - name: Setup Windows builder - run: | - choco install checksum --no-progress - choco install reshack --no-progress - - name: Set up Node uses: actions/setup-node@v1 with: From fd135929325b7a63b3589c816cbc4394d7216d32 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Thu, 4 Mar 2021 11:27:25 -0800 Subject: [PATCH 39/39] removing test code and removing cloc from release --- .github/workflows/build.yml | 2 -- .github/workflows/release.yml | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e0741d4788..204602e525b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,8 +70,6 @@ jobs: - name: gulp run: gulp ci - - name: test dist - run: ls dist - name: Upload opera artifact uses: actions/upload-artifact@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f2a7e84f958..0f30246fb7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,20 +9,6 @@ on: jobs: - cloc: - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - - 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: runs-on: ubuntu-latest outputs: @@ -119,9 +105,6 @@ jobs: del /S/Q "Source\.git\objects\pack\*" call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*" - - name: test dist - run: ls dist - - name: Upload opera release asset uses: actions/upload-release-asset@v1 env: