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(yaml): correctly add default parts #1815

Merged
merged 3 commits into from
Aug 15, 2024

Conversation

lengau
Copy link
Collaborator

@lengau lengau commented Aug 14, 2024

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.

@lengau lengau force-pushed the work/pydantic-2/inferred-part branch 5 times, most recently from 884984a to b439095 Compare August 15, 2024 16:32
@lengau lengau marked this pull request as ready for review August 15, 2024 16:48
@@ -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)
Copy link
Collaborator Author

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.

@lengau lengau requested a review from a team August 15, 2024 18:46
- name: Install skopeo (Linux)
if: ${{ runner.os == 'Linux' }}
run: |
if [[ $(cat /etc/os-release | grep VERSION_CODENAME) == 'VERSION_CODENAME=jammy' ]]; then
Copy link
Contributor

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 😄

Copy link
Collaborator Author

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.

Copy link
Contributor

@dariuszd21 dariuszd21 Aug 15, 2024

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)

@lengau lengau requested a review from dariuszd21 August 15, 2024 19:19
Copy link
Contributor

@dariuszd21 dariuszd21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@lengau lengau merged commit 2a0eb97 into feature/pydantic-2 Aug 15, 2024
15 of 16 checks passed
@lengau lengau deleted the work/pydantic-2/inferred-part branch August 15, 2024 19:50
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.

3 participants