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

Unbreak generate-release-yml.rs, update Ubuntu/Fedora Docker bases #1275

Closed
wants to merge 1 commit into from

Conversation

ckwalsh
Copy link
Contributor

@ckwalsh ckwalsh commented Feb 27, 2025

generate-release-yml.rs:

  • Seems like rust-script is picky with the comment format for cargo
    dependencies. Switching from /* */ to //! allows is to correctly
    build the script.
  • Remove Ubuntu 20.04 (gcc too old)
  • Add Ubuntu 24.04 (latest LTS)
  • Remove Fedora 36/37/38 (38 support ended 2024-05-21)
  • Add Fedora 40/41/42 (42 to be released 2025-04-22)

release.yml.in:

  • Bump action versions
  • Switch from watchman-build-env-DISTRO-VERSION:latest to
    watchman-build-env:DISTRO-VERSION-latest. This will avoid package
    name changes when versions are bumped, which can trigger non-obvious
    permission issues.
  • Bump linux-build job from ubuntu-20.04 to ubuntu-24.04
  • Regenerate release.yml

package.yml:

  • Bump action versions
  • Switch from ubuntu-22.04 to ubuntu-24.04

Test Plan:

cd ~/github/watchman/.github/workflows/
./generate-release-yml.rs

cd ~/github/watchman
docker build --build-arg UBUNTU_VERSION=22.04 -f watchman/build/package/ubuntu-env/Dockerfile .
docker build --build-arg UBUNTU_VERSION=24.04 -f watchman/build/package/ubuntu-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=40 -f watchman/build/package/fedora-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=41 -f watchman/build/package/fedora-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=42 -f watchman/build/package/fedora-env/Dockerfile .

git tag v2025.02.27.00
git push origin v2025.02.27.00
# Compare https://github.com/ckwalsh/watchman/actions/runs/13576588547 vs https://github.com/facebook/watchman/actions/runs/13502516295
# Note - cancelled full build to avoid GitHub Actions Billing

@facebook-github-bot
Copy link
Contributor

Hi @ckwalsh!

Thank you for your pull request.

We require contributors to sign our Contributor License Agreement, and yours needs attention.

You currently have a record in our system, but the CLA is no longer valid, and will need to be resubmitted.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

generate-release-yml.rs:

- Seems like rust-script is picky with the comment format for cargo
  dependencies. Switching from /* */ to //! allows is to correctly
  build the script.
- Remove Ubuntu 20.04 (gcc too old)
- Add Ubuntu 24.04 (latest LTS)
- Remove Fedora 36/37/38 (38 support ended 2024-05-21)
- Add Fedora 40/41/42 (42 to be released 2025-04-22)

release.yml.in:

- Bump action versions
- Switch from `watchman-build-env-DISTRO-VERSION:latest` to
  `watchman-build-env:DISTRO-VERSION-latest`. This will avoid package
  name changes when versions are bumped, which can trigger non-obvious
  permission issues.
- Bump `linux-build` job from ubuntu-20.04 to ubuntu-24.04
- Regenerate release.yml

package.yml:

- Bump action versions
- Switch from ubuntu-22.04 to ubuntu-24.04

Test Plan:
```
cd ~/github/watchman/.github/workflows/
./generate-release-yml.rs

cd ~/github/watchman
docker build --build-arg UBUNTU_VERSION=22.04 -f watchman/build/package/ubuntu-env/Dockerfile .
docker build --build-arg UBUNTU_VERSION=24.04 -f watchman/build/package/ubuntu-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=40 -f watchman/build/package/fedora-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=41 -f watchman/build/package/fedora-env/Dockerfile .
docker build --build-arg FEDORA_VERSION=42 -f watchman/build/package/fedora-env/Dockerfile .

git tag v2025.02.27.00
git push origin v2025.02.27.00
```
@facebook-github-bot
Copy link
Contributor

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@facebook-github-bot
Copy link
Contributor

@facebook-github-bot has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. (Because this pull request was imported automatically, there will not be any future comments.)

@chadaustin
Copy link
Contributor

Thanks Cullen, much love. Several people will appreciate these fixes. Trying to get it through internal CI now.

facebook-github-bot pushed a commit to facebook/CacheLib that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/fboss that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/mvfst that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookexperimental/moxygen that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/proxygen that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/openr that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookexperimental/rust-shed that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/folly that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/fb303 that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookexperimental/edencommon that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/sapling that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/wangle that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookincubator/fizz that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookincubator/katran that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/hhvm that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebookincubator/hsthrift that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
facebook-github-bot pushed a commit to facebook/fbthrift that referenced this pull request Feb 27, 2025
Summary:
X-link: facebookincubator/zstrong#1211

* Seems like rust-script is picky with the comment format for cargo dependencies. Switching from /* */ to //! allows is to correctly build the script.
* Remove Ubuntu 20.04 (gcc too old)
* Add Ubuntu 24.04 (latest LTS)
* Remove Fedora 36/37/38 (38 support ended 2024-05-21)
* Add Fedora 40/41/42 (42 to be released 2025-04-22)

X-link: facebook/watchman#1275

Reviewed By: chadaustin

Differential Revision: D70350468

fbshipit-source-id: f5a29743da5b381fadeba2ed35a440b4054ca453
@ckwalsh
Copy link
Contributor Author

ckwalsh commented Feb 28, 2025

Heh, shipit broken for Watchman?

Good to see it landed so quickly, thanks

@facebook-github-bot
Copy link
Contributor

This pull request has been merged in 9968dc4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants