mirror of
https://github.com/bitwarden/browser.git
synced 2024-12-27 17:18:04 +01:00
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
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -121,7 +121,7 @@ jobs:
|
||||
call git submodule update --init --recursive
|
||||
cd ../
|
||||
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
|
||||
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
||||
@ -155,7 +155,7 @@ jobs:
|
||||
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
|
||||
with:
|
||||
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
|
||||
|
||||
- name: Upload coverage artifact
|
||||
|
27
.github/workflows/release.yml
vendored
27
.github/workflows/release.yml
vendored
@ -83,34 +83,27 @@ jobs:
|
||||
- setup
|
||||
- locales-test
|
||||
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
|
||||
uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
|
||||
with:
|
||||
workflow: build.yml
|
||||
workflow_conclusion: success
|
||||
branch: release
|
||||
artifacts: 'browser-source-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
||||
dist-chrome-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
||||
dist-opera-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
||||
dist-firefox-${{ steps.get-build-commit.outputs.build-commit }}.zip,
|
||||
dist-edge-${{ steps.get-build-commit.outputs.build-commit }}.zip'
|
||||
artifacts: 'browser-source-*.zip,
|
||||
dist-chrome-*.zip,
|
||||
dist-opera-*.zip,
|
||||
dist-firefox-*.zip,
|
||||
dist-edge-*.zip'
|
||||
|
||||
- name: Rename build artifacts
|
||||
env:
|
||||
BUILD_COMMIT: ${{ steps.get-build-commit.outputs.build-commit }}
|
||||
PACKAGE_VERSION: ${{ needs.setup.outputs.release-version }}
|
||||
run: |
|
||||
mv browser-source-$BUILD_COMMIT.zip browser-source-$PACKAGE_VERSION.zip
|
||||
mv dist-chrome-$BUILD_COMMIT.zip dist-chrome-$PACKAGE_VERSION.zip
|
||||
mv dist-opera-$BUILD_COMMIT.zip dist-opera-$PACKAGE_VERSION.zip
|
||||
mv dist-firefox-$BUILD_COMMIT.zip dist-firefox-$PACKAGE_VERSION.zip
|
||||
mv dist-edge-$BUILD_COMMIT.zip dist-edge-$PACKAGE_VERSION.zip
|
||||
mv browser-source.zip browser-source-$PACKAGE_VERSION.zip
|
||||
mv dist-chrome.zip dist-chrome-$PACKAGE_VERSION.zip
|
||||
mv dist-opera.zip dist-opera-$PACKAGE_VERSION.zip
|
||||
mv dist-firefox.zip dist-firefox-$PACKAGE_VERSION.zip
|
||||
mv dist-edge.zip dist-edge-$PACKAGE_VERSION.zip
|
||||
|
||||
- name: Create release
|
||||
uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
|
||||
|
Loading…
Reference in New Issue
Block a user