Update workflows with linter suggestions (#2051)

This commit is contained in:
Vince Grassia 2021-09-02 16:03:47 -04:00 committed by GitHub
parent 0bd22dcddc
commit 61f551087f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 59 deletions

View File

@ -1,3 +1,4 @@
---
name: Build name: Build
on: on:
@ -10,6 +11,7 @@ on:
jobs: jobs:
cloc: cloc:
name: CLOC
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repo - name: Checkout repo
@ -24,6 +26,7 @@ jobs:
setup: setup:
name: Setup
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
repo_url: ${{ steps.gen_vars.outputs.repo_url }} repo_url: ${{ steps.gen_vars.outputs.repo_url }}
@ -38,10 +41,11 @@ jobs:
repo_url=https://github.com/$GITHUB_REPOSITORY.git repo_url=https://github.com/$GITHUB_REPOSITORY.git
adj_build_num=${GITHUB_SHA:0:7} adj_build_num=${GITHUB_SHA:0:7}
echo "::set-output name=repo_url::$repo_url" 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::$adj_build_num"
locales-test: locales-test:
name: Locales Test
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: setup needs: setup
steps: steps:
@ -63,21 +67,21 @@ jobs:
found_error=true found_error=true
fi fi
done done
if $found_error; then if $found_error; then
echo echo
echo "Please fix 'extName' for the locales listed above." echo "Please fix 'extName' for the locales listed above."
exit 1 exit 1
else else
echo "Test passed!" echo "Test passed!"
fi fi
build: build:
name: Build
runs-on: windows-latest runs-on: windows-latest
needs: [ setup, locales-test ] needs: [setup, locales-test]
env: env:
REPO_URL: ${{ needs.setup.outputs.repo_url }} _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@ -96,41 +100,41 @@ jobs:
node --version node --version
npm --version npm --version
- name: npm setup & test - name: NPM setup & test
run: | run: |
npm install npm install
npm run dist npm run dist
npm run test npm run test
- name: gulp - name: Gulp
run: gulp ci run: gulp ci
- name: Upload opera artifact - name: Upload Opera artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: dist-opera-${{ env.BUILD_NUMBER }}.zip name: dist-opera-${{ env._BUILD_NUMBER }}.zip
path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip path: dist/dist-opera-${{ env._BUILD_NUMBER }}.zip
- name: Upload chrome artifact - name: Upload Chrome artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: dist-chrome-${{ env.BUILD_NUMBER }}.zip name: dist-chrome-${{ env._BUILD_NUMBER }}.zip
path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip path: dist/dist-chrome-${{ env._BUILD_NUMBER }}.zip
- name: Upload firefox artifact - name: Upload Firefox artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: dist-firefox-${{ env.BUILD_NUMBER }}.zip name: dist-firefox-${{ env._BUILD_NUMBER }}.zip
path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip path: dist/dist-firefox-${{ env._BUILD_NUMBER }}.zip
- name: Upload edge artifact - name: Upload Edge artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: dist-edge-${{ env.BUILD_NUMBER }}.zip name: dist-edge-${{ env._BUILD_NUMBER }}.zip
path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip path: dist/dist-edge-${{ env._BUILD_NUMBER }}.zip
- name: Upload coverage artifact - name: Upload coverage artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
with: with:
name: coverage-${{ env.BUILD_NUMBER }}.zip name: coverage-${{ env._BUILD_NUMBER }}.zip
path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip path: coverage/coverage-${{ env._BUILD_NUMBER }}.zip

View File

@ -1,18 +1,19 @@
---
name: Crowdin Sync name: Crowdin Sync
on: on:
workflow_dispatch: workflow_dispatch:
inputs: {} inputs: {}
#schedule: # schedule:
# - cron: '0 0 * * *' # - cron: '0 0 * * *'
jobs: jobs:
crowdin-sync: crowdin-sync:
name: Autosync name: Autosync
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
CROWDIN_BASE_URL: "https://api.crowdin.com/api/v2/projects" _CROWDIN_BASE_URL: "https://api.crowdin.com/api/v2/projects"
CROWDIN_PROJECT_ID: "268134" _CROWDIN_PROJECT_ID: "268134"
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@ -61,7 +62,7 @@ jobs:
# Step 1: GET master branchId # Step 1: GET master branchId
BRANCH_ID=$( BRANCH_ID=$(
curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \ curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
$CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/branches | jq -r '.data[0].data.id' $_CROWDIN_BASE_URL/$_CROWDIN_PROJECT_ID/branches | jq -r '.data[0].data.id'
) )
echo "[*] Crowin master branch id: $BRANCH_ID" echo "[*] Crowin master branch id: $BRANCH_ID"
echo "::set-output name=id::$BRANCH_ID" echo "::set-output name=id::$BRANCH_ID"
@ -77,7 +78,7 @@ jobs:
curl -X POST -s \ curl -X POST -s \
-H "Authorization: Bearer $CROWDIN_API_TOKEN" \ -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
$CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds \ $_CROWDIN_BASE_URL/$_CROWDIN_PROJECT_ID/translations/builds \
-d "{\"branchId\": $CROWDIN_MASTER_BRANCH_ID}" | jq -r '.data.id' -d "{\"branchId\": $CROWDIN_MASTER_BRANCH_ID}" | jq -r '.data.id'
) )
echo "[*] Crowin translations build id: $BRANCH_ID" echo "[*] Crowin translations build id: $BRANCH_ID"
@ -92,7 +93,7 @@ jobs:
for try in {1..$MAX_TRIES}; do for try in {1..$MAX_TRIES}; do
BRANCH_STATUS=$( BRANCH_STATUS=$(
curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \ curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
$CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds/$CROWDIN_BUILD_ID | jq -r '.data.status' $_CROWDIN_BASE_URL/$_CROWDIN_PROJECT_ID/translations/builds/$CROWDIN_BUILD_ID | jq -r '.data.status'
) )
echo "[*] Build status: $BRANCH_STATUS" echo "[*] Build status: $BRANCH_STATUS"
if [[ "$BRANCH_STATUS" == "finished" ]]; then break; fi if [[ "$BRANCH_STATUS" == "finished" ]]; then break; fi
@ -113,7 +114,7 @@ jobs:
# Step 4: when build is finished, get download url # Step 4: when build is finished, get download url
DOWNLOAD_URL=$( DOWNLOAD_URL=$(
curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \ curl -s -H "Authorization: Bearer $CROWDIN_API_TOKEN" \
$CROWDIN_BASE_URL/$CROWDIN_PROJECT_ID/translations/builds/$CROWDIN_BUILD_ID/download | jq -r '.data.url' $_CROWDIN_BASE_URL/$_CROWDIN_PROJECT_ID/translations/builds/$CROWDIN_BUILD_ID/download | jq -r '.data.url'
) )
echo "[*] Crowin translations download url: $DOWNLOAD_URL" echo "[*] Crowin translations download url: $DOWNLOAD_URL"
echo "::set-output name=value::$DOWNLOAD_URL" echo "::set-output name=value::$DOWNLOAD_URL"

View File

@ -1,3 +1,4 @@
---
name: Release name: Release
on: on:
@ -10,6 +11,7 @@ on:
jobs: jobs:
setup: setup:
name: Setup
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
tag_version: ${{ steps.create_tags.outputs.tag_version }} tag_version: ${{ steps.create_tags.outputs.tag_version }}
@ -25,7 +27,7 @@ jobs:
echo "===================================" echo "==================================="
exit 1 exit 1
fi fi
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@ -37,8 +39,8 @@ jobs:
$build_num = [int]$env:GITHUB_RUN_NUMBER $build_num = [int]$env:GITHUB_RUN_NUMBER
$adj_build_num = $build_num + 3000 $adj_build_num = $build_num + 3000
echo "::set-output name=repo_url::$repo_url" 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::$adj_build_num"
- name: Create Release Vars - name: Create Release Vars
id: create_tags id: create_tags
@ -74,6 +76,7 @@ jobs:
locales-test: locales-test:
name: Locales Test
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: setup needs: setup
steps: steps:
@ -105,11 +108,12 @@ jobs:
fi fi
build: build:
name: Build
runs-on: windows-latest runs-on: windows-latest
needs: [ setup, locales-test ] needs: [setup, locales-test]
env: env:
REPO_URL: ${{ needs.setup.outputs.repo_url }} _REPO_URL: ${{ needs.setup.outputs.repo_url }}
BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@ -128,84 +132,84 @@ jobs:
node --version node --version
npm --version npm --version
- name: npm setup & test - name: NPM setup & test
run: | run: |
npm install npm install
npm run dist npm run dist
npm run test npm run test
- name: gulp - name: Gulp
run: gulp ci run: gulp ci
- name: Build sources for reviewers - name: Build sources for reviewers
shell: cmd shell: cmd
run: | run: |
mkdir dist\Source mkdir dist\Source
call git clone %REPO_URL% dist\Source call git clone %_REPO_URL% dist\Source
cd dist\Source cd dist\Source
call git checkout %GITHUB_SHA% call git checkout %GITHUB_SHA%
call git submodule update --init --recursive call git submodule update --init --recursive
cd ../ cd ../
del /S/Q "Source\.git\objects\pack\*" del /S/Q "Source\.git\objects\pack\*"
call 7z a browser-source-%BUILD_NUMBER%.zip "Source\*" call 7z a browser-source-%_BUILD_NUMBER%.zip "Source\*"
- name: upload opera release asset - name: Upload Opera release asset
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: dist-opera-${{ env.BUILD_NUMBER }}.zip asset_name: dist-opera-${{ env._BUILD_NUMBER }}.zip
asset_path: dist/dist-opera-${{ env.BUILD_NUMBER }}.zip asset_path: dist/dist-opera-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application asset_content_type: application
- name: upload chrome release asset - name: Upload Chrome release asset
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: dist-chrome-${{ env.BUILD_NUMBER }}.zip asset_name: dist-chrome-${{ env._BUILD_NUMBER }}.zip
asset_path: dist/dist-chrome-${{ env.BUILD_NUMBER }}.zip asset_path: dist/dist-chrome-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application/zip asset_content_type: application/zip
- name: upload firefox release asset - name: Upload Firefox release asset
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: dist-firefox-${{ env.BUILD_NUMBER }}.zip asset_name: dist-firefox-${{ env._BUILD_NUMBER }}.zip
asset_path: dist/dist-firefox-${{ env.BUILD_NUMBER }}.zip asset_path: dist/dist-firefox-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application/zip asset_content_type: application/zip
- name: upload edge release asset - name: Upload Edge release asset
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: dist-edge-${{ env.BUILD_NUMBER }}.zip asset_name: dist-edge-${{ env._BUILD_NUMBER }}.zip
asset_path: dist/dist-edge-${{ env.BUILD_NUMBER }}.zip asset_path: dist/dist-edge-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application/zip asset_content_type: application/zip
- name: upload browser source zip release asset - name: Upload browser source zip release asset
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: browser-source-${{ env.BUILD_NUMBER }}.zip asset_name: browser-source-${{ env._BUILD_NUMBER }}.zip
asset_path: dist/browser-source-${{ env.BUILD_NUMBER }}.zip asset_path: dist/browser-source-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application/zip asset_content_type: application/zip
- name: upload coverage release asset - name: Upload coverage release asset
if: false if: false
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.setup.outputs.release_upload_url }} upload_url: ${{ needs.setup.outputs.release_upload_url }}
asset_name: coverage-${{ env.BUILD_NUMBER }}.zip asset_name: coverage-${{ env._BUILD_NUMBER }}.zip
asset_path: coverage/coverage-${{ env.BUILD_NUMBER }}.zip asset_path: coverage/coverage-${{ env._BUILD_NUMBER }}.zip
asset_content_type: application/zip asset_content_type: application/zip