-
Notifications
You must be signed in to change notification settings - Fork 71
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(yaml): correctly add default parts #1815
Conversation
884984a
to
b439095
Compare
@@ -80,15 +80,28 @@ jobs: | |||
run: | | |||
sudo apt update | |||
sudo apt install -y python3-pip python3-setuptools python3-wheel python3-venv libapt-pkg-dev | |||
- name: Install external dependencies with homebrew | |||
- name: Install skopeo (mac) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes prevent the Jammy builders from getting a Homebrew-installed version of Python 3.12 that has weird behaviour.
- name: Install skopeo (Linux) | ||
if: ${{ runner.os == 'Linux' }} | ||
run: | | ||
if [[ $(cat /etc/os-release | grep VERSION_CODENAME) == 'VERSION_CODENAME=jammy' ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm kind of lost in here, cause it checks if it's jammy and it installs skopeo
through homebrew and then deletes the binary ?
It's quite different from the comment above which states that it should prevent Jammy from getting a homebrew installed version of python3.12 :D
You're installing it to remove it and to link it to the version I have no idea how was installed 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm installing it from homebrew, which puts it in ~/.linuxbrew/bin
. There's an (old) skopeo executable in /bin
, which I'm deleting and then replacing with this linuxbrew installed version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it! Makes sense. I was confused by the above comment.
One additional small question, is the below script required, also when you use apt version of skopeo?:
# Allow skopeo to access the contents of /run/containers
sudo chmod 777 /run/containers
# Add an xdg runtime dir for skopeo to look into for an auth.json file
sudo mkdir -p /run/user/$(id -u)
sudo chown $USER /run/user/$(id -u)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
The pydantic 2 change caused some weirdness in adding default parts, so this fixes it. After this, pydantic 2 should be ready to merge to main.