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.

Sign up for GitHub

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

Jump to bottom

Rename master to main #150

Closed
jfpanisset opened this issue Feb 13, 2022 · 3 comments · Fixed by #225
Closed

Rename master to main #150

jfpanisset opened this issue Feb 13, 2022 · 3 comments · Fixed by #225

Comments

@jfpanisset
Copy link
Contributor

As per ASWF guidance, master branch should be renamed to main. Local branches will need to:

git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
@jfpanisset jfpanisset changed the title Update master to main Rename master to main Feb 13, 2022
@jfpanisset
Copy link
Contributor Author

Watch out for code in python/aswfdocker/utils.py which hard codes master branch:

def get_docker_org(repo_uri: str, source_branch: str) -> str:
    if not source_branch and not repo_uri:
        return constants.TESTING_DOCKER_ORG
    if (
        source_branch == "refs/heads/master"
        and constants.MAIN_GITHUB_ASWF_DOCKER_URL.endswith(repo_uri)
    ):

@jfpanisset
Copy link
Contributor Author

LF Ticket:

https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/IT-27216

jfpanisset added a commit to jfpanisset/aswf-docker that referenced this issue Sep 19, 2024
@jfpanisset
Rename master branch to main
60e7669 
As per ASWF guidance, renaming master branch to main. This
addresses [Issue AcademySoftwareFoundation#150](AcademySoftwareFoundation#150).

.github/workflows/docker-builds.yml

Address [Issue AcademySoftwareFoundation#217](AcademySoftwareFoundation#217):
don't try to use larger runners when running outside the context of the ASWF org, they
won't be available. Don't expect Qt/PySide builds to complete on standard runners though.

Signed-off-by: Jean-Francois Panisset <[email protected]>
@jfpanisset jfpanisset mentioned this issue Sep 19, 2024
Merged
@jfpanisset
Copy link
Contributor Author

Addressed in PR #218

jfpanisset added a commit that referenced this issue Sep 20, 2024
@jfpanisset
Rename master branch to main
5b12283 
As per ASWF guidance, renaming master branch to main. This
addresses [Issue #150](#150).

.github/workflows/docker-builds.yml

Address [Issue #217](#217):
don't try to use larger runners when running outside the context of the ASWF org, they
won't be available. Don't expect Qt/PySide builds to complete on standard runners though.

Signed-off-by: Jean-Francois Panisset <[email protected]>
jfpanisset added a commit to jfpanisset/aswf-docker that referenced this issue Oct 6, 2024
@jfpanisset
2024.2 images
ea9e591 
- 2024.2 images
- update latest / preview / draft tags for Docker images
- update Python dependencies (resolve dependabot PRs)
- update pylint and fix pylint / pytest warnings
- Fix SonarCloud scanning
- Conan 1.65 (was 1.64)
- Expat 2.6.3 (was 2.5.0) to address CVEs CVE-2024-45492 CVE-2024-45491 CVE-2024-45490
- fixes AcademySoftwareFoundation#196 : ci-openrv build container. OpenRV doesn't build yet, waiting for Qt6 support.
  For now openrv builds in non-default review group.
- fixes AcademySoftwareFoundation#150 : rename master branch to main
- fixes AcademySoftwareFoundation#218 : only attempt to use larger runners when running in context of ASWF GitHub org.
- fixes AcademySoftwareFoundation#221 : ci-usd now includes Python dependencies
- fixes AcademySoftwareFoundation#148 : Vulkan SDK and runtime now included in all images, initially required
  for ci-openrv, but useful in general. Also Qt now built with Vulkan support
- CUDA 12.6.1 (was 12.3.0)
- Java 17 (was 11) for ci-opencue image
- Imath 3.1.12 (was 3.1.11)
- MaterialX 1.39.1 (was 1.38.10)
- OpenImageIO 2.15.16.0 (was 2.15.15.0)
- OpenShadingLanguage 1.13.11.0 (was 1.13.10.0)
- Python 3.11.10 (was 3.11.9)
- USD 24.08 (was 24.05) with PR #3159 for MateriaX 1.39.1

Signed-off-by: Jean-Francois Panisset <[email protected]>
@jfpanisset jfpanisset mentioned this issue Oct 6, 2024
Merged
jfpanisset added a commit that referenced this issue Oct 6, 2024
@jfpanisset
2024.2 images
bfe51c2 
- 2024.2 images
- update latest / preview / draft tags for Docker images
- update Python dependencies (resolve dependabot PRs)
- update pylint and fix pylint / pytest warnings
- Fix SonarCloud scanning
- Conan 1.65 (was 1.64)
- Expat 2.6.3 (was 2.5.0) to address CVEs CVE-2024-45492 CVE-2024-45491 CVE-2024-45490
- fixes #196 : ci-openrv build container. OpenRV doesn't build yet, waiting for Qt6 support.
  For now openrv builds in non-default review group.
- fixes #150 : rename master branch to main
- fixes #218 : only attempt to use larger runners when running in context of ASWF GitHub org.
- fixes #221 : ci-usd now includes Python dependencies
- fixes #148 : Vulkan SDK and runtime now included in all images, initially required
  for ci-openrv, but useful in general. Also Qt now built with Vulkan support
- CUDA 12.6.1 (was 12.3.0)
- Java 17 (was 11) for ci-opencue image
- Imath 3.1.12 (was 3.1.11)
- MaterialX 1.39.1 (was 1.38.10)
- OpenImageIO 2.15.16.0 (was 2.15.15.0)
- OpenShadingLanguage 1.13.11.0 (was 1.13.10.0)
- Python 3.11.10 (was 3.11.9)
- USD 24.08 (was 24.05) with PR #3159 for MateriaX 1.39.1

Signed-off-by: Jean-Francois Panisset <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

2024.2 images jfpanisset/aswf-docker
1 participant
@jfpanisset