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

fix(gha): Set Package Architecture when Uploading to Pulp #10339

Merged
merged 3 commits into from
Feb 24, 2023

Conversation

curiositycasualty
Copy link
Contributor

@curiositycasualty curiositycasualty commented Feb 21, 2023

Summary

This needed to have been ported from EE -> CE (which we don't have a formal process for).
In EE, it's a fix that got applied along my arm64 Amazon Linux work.
CE also needs this fix.

Without this fix, arm64 package files are erroneously uploaded with "amd64" in the filename-- sometimes overwriting previously uploaded (legitimate amd64) packages.

Checklist

Full changelog

Issue reference

@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Feb 21, 2023
.github/workflows/release.yml Outdated Show resolved Hide resolved
@tyler-ball tyler-ball added this to the 3.2.1 milestone Feb 24, 2023
Co-authored-by: Tyler Ball <2481463+tyler-ball@users.noreply.github.com>
@curiositycasualty curiositycasualty merged commit 35c4b7a into master Feb 24, 2023
@curiositycasualty curiositycasualty deleted the build/upload-arch branch February 24, 2023 17:56
@mashapedeployment
Copy link
Contributor

The backport to release/3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.2.x release/3.2.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.2.x
# Create a new branch
git switch --create backport-10339-to-release/3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 35c4b7a22d266262e4165fa9869a73c21202c677
# Push it to GitHub
git push --set-upstream origin backport-10339-to-release/3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.2.x

Then, create a pull request where the base branch is release/3.2.x and the compare/head branch is backport-10339-to-release/3.2.x.

curiositycasualty added a commit that referenced this pull request Feb 24, 2023
* fix(gha): set package arch for upload

* Update .github/workflows/release.yml

Co-authored-by: Tyler Ball <2481463+tyler-ball@users.noreply.github.com>

---------

Co-authored-by: Tyler Ball <2481463+tyler-ball@users.noreply.github.com>
(cherry picked from commit 35c4b7a)
tyler-ball pushed a commit that referenced this pull request Feb 24, 2023
…10369)

* fix(gha): set package arch for upload

* Update .github/workflows/release.yml

Co-authored-by: Tyler Ball <2481463+tyler-ball@users.noreply.github.com>

---------

Co-authored-by: Tyler Ball <2481463+tyler-ball@users.noreply.github.com>
(cherry picked from commit 35c4b7a)
This was referenced Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Not part of the core functionality of kong, but still needed size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants