Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #1881

Merged
merged 5 commits into from
May 13, 2024
Merged

Merge develop into master #1881

merged 5 commits into from
May 13, 2024

Conversation

jesuyedavid
Copy link
Contributor

@jesuyedavid jesuyedavid commented May 13, 2024

Changes

nmanu1 and others added 5 commits February 20, 2024 14:43
Merge master (v1.17.0) into develop
Merge master (v1.17.1) into develop
Notable Changes:

1. We added two new jobs: `merge_multiple_artifacts` and `overwrite_artifact` in `.github/workflows/build_i18n.yml` to handle merging multiple locale files into the `build-output-US` and `build-output-EU` artifacts. This was necessary since we have to handle no longer being able to have multiple jobs in the same workflow write to one artifact name and mutate it, [a breaking change](https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md#multiple-uploads-to-the-same-named-artifact) in `action/upload-artifact@v4`. Since `build_and_deploy_i18n.yml` calls both `build.yml` and `build_i18n.yml`, we can't have both write an artifact called `build-output-US` unless we pass the `overwrite: true` input in the latter. The `action/upload-artifact/merge@v4` doesn't allow overwriting, so we need an additional step of merging and uploading with a temporary name and then downloading the merged artifact and re-uploading to overwrite the correct name.

2. We bumped `google-github-actions/auth` and `google-github-actions/upload-cloud-storage` from v0 to v2

3. Updated  `actions/checkout`, `actions/setup-node`, `actions/upload-artifact`, `actions/download-artifact`, and `aws-actions/configure-aws-credentials` actions to v4

[J=WAT-4020](https://yexttest.atlassian.net/browse/WAT-4020)
TEST=manual

Testing was done in a forked repo. View [actions](https://github.com/jesuyedavid/answers-search-ui/actions) to see testing details and test commits. We also checked the US/EU build artifact unzipped files to ensure they are uploaded to AWS/GCP properly and that they look similar to build files prior to this update. Finally, we did local testing from the Answers-Hitchhiker-Theme repo's test site that pointed to our dev assets in AWS. The `dev` bucket in GCP did not have the correct permissions to allow local testing, so this local testing will be done after merging this PR and the changes from develop are pushed to `canary` in GCP.
@coveralls
Copy link

Coverage Status

coverage: 62.092%. remained the same
when pulling 7ab71e9 on develop
into b790f41 on master.

@jesuyedavid jesuyedavid merged commit b393ad7 into master May 13, 2024
38 of 41 checks passed
@jesuyedavid jesuyedavid deleted the develop branch May 13, 2024 20:55
@jesuyedavid jesuyedavid restored the develop branch May 13, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants