Merge pull request #2147 from bitwarden/hotfix/build-artifact-naming-fix
fixing the different naming schemes between the build artifacts
This commit is contained in:
commit
814ecee924
|
@ -121,7 +121,7 @@ jobs:
|
||||||
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.zip "Source\*"
|
||||||
|
|
||||||
- name: Upload Opera artifact
|
- name: Upload Opera artifact
|
||||||
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
||||||
|
@ -155,7 +155,7 @@ jobs:
|
||||||
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
||||||
with:
|
with:
|
||||||
name: browser-source-${{ env._BUILD_NUMBER }}.zip
|
name: browser-source-${{ env._BUILD_NUMBER }}.zip
|
||||||
path: dist/browser-source-${{ env._BUILD_NUMBER }}.zip
|
path: dist/browser-source.zip
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- name: Upload coverage artifact
|
- name: Upload coverage artifact
|
||||||
|
|
|
@ -83,34 +83,27 @@ jobs:
|
||||||
- setup
|
- setup
|
||||||
- locales-test
|
- locales-test
|
||||||
steps:
|
steps:
|
||||||
- name: Get build number
|
|
||||||
id: get-build-commit
|
|
||||||
run: |
|
|
||||||
build_commit=$(ls browser-source-* | cut -d '.' -f 1 | cut -d '-' -f 3)
|
|
||||||
echo "::set-output name=build-commit::$build_commit"
|
|
||||||
|
|
||||||
- name: Download latest RC build artifacts
|
- name: Download latest RC build artifacts
|
||||||
uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
|
uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
|
||||||
with:
|
with:
|
||||||
workflow: build.yml
|
workflow: build.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
branch: release
|
branch: release
|
||||||
artifacts: 'browser-source-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
artifacts: 'browser-source-*.zip,
|
||||||
dist-chrome-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
dist-chrome-*.zip,
|
||||||
dist-opera-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
dist-opera-*.zip,
|
||||||
dist-firefox-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
dist-firefox-*.zip,
|
||||||
dist-edge-${{ steps.get-build-commit.outputs.build-commit }}.zip'
|
dist-edge-*.zip'
|
||||||
|
|
||||||
- name: Rename build artifacts
|
- name: Rename build artifacts
|
||||||
env:
|
env:
|
||||||
BUILD_COMMIT: ${{ steps.get-build-commit.outputs.build-commit }}
|
|
||||||
PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
|
PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
|
||||||
run: |
|
run: |
|
||||||
mv browser-source-$BUILD_COMMIT.zip browser-source-$PACKAGE_VERSION.zip
|
mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
|
||||||
mv dist-chrome-$BUILD_COMMIT.zip dist-chrome-$PACKAGE_VERSION.zip
|
mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
|
||||||
mv dist-opera-$BUILD_COMMIT.zip dist-opera-$PACKAGE_VERSION.zip
|
mv dist-opera.zip dist-opera-$PACKAGE_VERSION.zip
|
||||||
mv dist-firefox-$BUILD_COMMIT.zip dist-firefox-$PACKAGE_VERSION.zip
|
mv dist-firefox.zip dist-firefox-$PACKAGE_VERSION.zip
|
||||||
mv dist-edge-$BUILD_COMMIT.zip dist-edge-$PACKAGE_VERSION.zip
|
mv dist-edge.zip dist-edge-$PACKAGE_VERSION.zip
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
|
uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
|
||||||
|
|
Loading…
Reference in New Issue