diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3961b4f384..ec90ce21bf 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 1c07838218..41cad45738 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