Skip to content
This repository was archived by the owner on Nov 27, 2025. It is now read-only.

Commit 21c0f12

Browse files
Maxim-Doronindependabot[bot]
authored andcommitted
SDL fixes 2 (#43)
* Bump braces from 3.0.2 to 3.0.3 in /mlir/utils/vscode Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump packaging Bumps the llvm-docs-requirements group with 1 update in the /llvm/docs directory: [packaging](https://github.com/pypa/packaging). Updates `packaging` from 24.0 to 24.1 - [Release notes](https://github.com/pypa/packaging/releases) - [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst) - [Commits](pypa/packaging@24.0...24.1) --- updated-dependencies: - dependency-name: packaging dependency-type: direct:production update-type: version-update:semver-minor dependency-group: llvm-docs-requirements ... Signed-off-by: dependabot[bot] <[email protected]> * Bump the github-actions group across 1 directory with 2 updates Bumps the github-actions group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 3.1.0 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Commits](actions/checkout@v3.1.0...v4.1.7) Updates `github/codeql-action` from 3.25.8 to 3.25.10 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@2e230e8...23acc5c) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> * Bump urllib3 from 2.0.7 to 2.2.2 in /llvm/utils/git Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.7 to 2.2.2. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.0.7...2.2.2) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump urllib3 from 2.2.1 to 2.2.2 in /llvm/docs Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.2.1...2.2.2) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump minimatch from 3.0.4 to 3.1.2 in /mlir/utils/vscode Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump semver from 5.7.1 to 5.7.2 in /llvm/utils/vscode/llvm Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump gitpython from 3.1.32 to 3.1.41 in /llvm/utils/git Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.32 to 3.1.41. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](gitpython-developers/GitPython@3.1.32...3.1.41) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump qs from 6.10.1 to 6.12.1 in /mlir/utils/vscode Bumps [qs](https://github.com/ljharb/qs) from 6.10.1 to 6.12.1. - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](ljharb/qs@v6.10.1...v6.12.1) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * cryptography version is bumped * Bump urllib3 version * Bump requests version * Bump idna version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 7f1b776 commit 21c0f12

24 files changed

+405
-195
lines changed

.github/workflows/build-ci-container.yml

Lines changed: 67 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -18,84 +18,95 @@ on:
1818
- '.github/workflows/containers/github-action-ci/**'
1919

2020
jobs:
21-
build-ci-container:
21+
# TODO(boomanaiden154): Switch this back to a single stage build when we can
22+
# run this on the self-hosted runners and don't have to do it this way to
23+
# avoid timeouts.
24+
build-ci-container-stage1:
2225
if: github.repository_owner == 'llvm'
23-
runs-on: depot-ubuntu-22.04-16
24-
outputs:
25-
container-name: ${{ steps.vars.outputs.container-name }}
26-
container-name-agent: ${{ steps.vars.outputs.container-name-agent }}
27-
container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
28-
container-name-agent-tag: ${{ steps.vars.outputs.container-name-agent-tag }}
29-
container-filename: ${{ steps.vars.outputs.container-filename }}
30-
container-agent-filename: ${{ steps.vars.outputs.container-agent-filename }}
26+
runs-on: ubuntu-latest
3127
steps:
3228
- name: Checkout LLVM
3329
uses: actions/checkout@v4
3430
with:
3531
sparse-checkout: .github/workflows/containers/github-action-ci/
32+
- name: Change podman Root Direcotry
33+
run: |
34+
mkdir -p ~/.config/containers
35+
sudo mkdir -p /mnt/podman
36+
sudo chown `whoami`:`whoami` /mnt/podman
37+
cp ./.github/workflows/containers/github-action-ci/storage.conf ~/.config/containers/storage.conf
38+
podman info
39+
- name: Build container stage1
40+
working-directory: ./.github/workflows/containers/github-action-ci/
41+
run: |
42+
podman build -t stage1-toolchain --target stage1-toolchain -f stage1.Dockerfile .
43+
- name: Save container image
44+
run: |
45+
podman save stage1-toolchain > stage1-toolchain.tar
46+
- name: Upload container image
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: stage1-toolchain
50+
path: stage1-toolchain.tar
51+
retention-days: 1
52+
build-ci-container-stage2:
53+
if: github.repository_owner == 'llvm'
54+
runs-on: ubuntu-latest
55+
needs: build-ci-container-stage1
56+
permissions:
57+
packages: write
58+
steps:
3659
- name: Write Variables
3760
id: vars
3861
run: |
3962
tag=`date +%s`
4063
container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/ci-ubuntu-22.04"
4164
echo "container-name=$container_name" >> $GITHUB_OUTPUT
42-
echo "container-name-agent=$container_name-agent" >> $GITHUB_OUTPUT
4365
echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
44-
echo "container-name-agent-tag=$container_name-agent:$tag" >> $GITHUB_OUTPUT
45-
echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
46-
echo "container-agent-filename=$(echo $container_name-agent:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
47-
- name: Build container
48-
working-directory: ./.github/workflows/containers/github-action-ci/
49-
run: |
50-
podman build --target ci-container -t ${{ steps.vars.outputs.container-name-tag }} .
51-
podman build --target ci-container-agent -t ${{ steps.vars.outputs.container-name-agent-tag }} .
5266
53-
# Save the container so we have it in case the push fails. This also
54-
# allows us to separate the push step into a different job so we can
55-
# maintain minimal permissions while building the container.
56-
- name: Save container image
67+
- name: Checkout LLVM
68+
uses: actions/[email protected]
69+
with:
70+
sparse-checkout: .github/workflows/containers/github-action-ci/
71+
72+
- name: Change podman Root Direcotry
5773
run: |
58-
podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
59-
podman save ${{ steps.vars.outputs.container-name-agent-tag }} > ${{ steps.vars.outputs.container-agent-filename }}
74+
mkdir -p ~/.config/containers
75+
sudo mkdir -p /mnt/podman
76+
sudo chown `whoami`:`whoami` /mnt/podman
77+
cp ./.github/workflows/containers/github-action-ci/storage.conf ~/.config/containers/storage.conf
78+
podman info
6079
61-
- name: Upload container image
62-
uses: actions/upload-artifact@v4
80+
# Download the container image into /mnt/podman rather than
81+
# $GITHUB_WORKSPACE to avoid space limitations on the default drive
82+
# and use the permissions setup for /mnt/podman.
83+
- name: Download stage1-toolchain
84+
uses: actions/download-artifact@v4
6385
with:
64-
name: container
65-
path: "*.tar"
66-
retention-days: 14
86+
name: stage1-toolchain
87+
path: /mnt/podman
88+
89+
- name: Load stage1-toolchain
90+
run: |
91+
podman load -i /mnt/podman/stage1-toolchain.tar
92+
93+
- name: Build Container
94+
working-directory: ./.github/workflows/containers/github-action-ci/
95+
run: |
96+
podman build -t ${{ steps.vars.outputs.container-name-tag }} -f stage2.Dockerfile .
97+
podman tag ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}:latest
6798
6899
- name: Test Container
69100
run: |
70-
for image in ${{ steps.vars.outputs.container-name-tag }}; do
71-
# Use --pull=never to ensure we are testing the just built image.
72-
podman run --pull=never --rm -it $image /usr/bin/bash -x -c 'cd $HOME && printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
101+
for image in ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}; do
102+
podman run --rm -it $image /usr/bin/bash -x -c 'printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
73103
done
74104
75-
push-ci-container:
76-
if: github.event_name == 'push'
77-
needs:
78-
- build-ci-container
79-
permissions:
80-
packages: write
81-
runs-on: ubuntu-24.04
82-
env:
83-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
84-
steps:
85-
- name: Download container
86-
uses: actions/download-artifact@v4
87-
with:
88-
name: container
89-
90105
- name: Push Container
106+
if: github.event_name == 'push'
107+
env:
108+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91109
run: |
92-
podman load -i ${{ needs.build-ci-container.outputs.container-filename }}
93-
podman tag ${{ needs.build-ci-container.outputs.container-name-tag }} ${{ needs.build-ci-container.outputs.container-name }}:latest
94110
podman login -u ${{ github.actor }} -p $GITHUB_TOKEN ghcr.io
95-
podman push ${{ needs.build-ci-container.outputs.container-name-tag }}
96-
podman push ${{ needs.build-ci-container.outputs.container-name }}:latest
97-
98-
podman load -i ${{ needs.build-ci-container.outputs.container-agent-filename }}
99-
podman tag ${{ needs.build-ci-container.outputs.container-name-agent-tag }} ${{ needs.build-ci-container.outputs.container-name-agent }}:latest
100-
podman push ${{ needs.build-ci-container.outputs.container-name-agent-tag }}
101-
podman push ${{ needs.build-ci-container.outputs.container-name-agent }}:latest
111+
podman push ${{ steps.vars.outputs.container-name-tag }}
112+
podman push ${{ steps.vars.outputs.container-name }}:latest

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
# a local checkout beforehand.
6161
- name: Fetch LLVM sources (Push)
6262
if: ${{ github.event_name == 'push' }}
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v4.1.7
6464
with:
6565
fetch-depth: 1
6666
- name: Get subprojects that have doc changes
@@ -98,7 +98,7 @@ jobs:
9898
- '.github/workflows/docs.yml'
9999
- name: Fetch LLVM sources (PR)
100100
if: ${{ github.event_name == 'pull_request' }}
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v4.1.7
102102
with:
103103
fetch-depth: 1
104104
- name: Setup Python env

.github/workflows/issue-release-workflow.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick')
4343
steps:
4444
- name: Fetch LLVM sources
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v4.1.7
4646
with:
4747
repository: llvm/llvm-project
4848
# GitHub stores the token used for checkout and uses it for pushes
@@ -61,9 +61,37 @@ jobs:
6161
printf "%s" "$COMMENT_BODY" |
6262
./llvm/utils/git/github-automation.py \
6363
--repo "$GITHUB_REPOSITORY" \
64-
--token "${{ secrets.RELEASE_WORKFLOW_PR_CREATE }}" \
64+
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
6565
release-workflow \
66-
--branch-repo-token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
6766
--issue-number ${{ github.event.issue.number }} \
68-
--requested-by ${{ (github.event.action == 'opened' && github.event.issue.user.login) || github.event.comment.user.login }} \
67+
--phab-token ${{ secrets.RELEASE_WORKFLOW_PHAB_TOKEN }} \
68+
auto
69+
70+
create-pull-request:
71+
name: Create Pull Request
72+
runs-on: ubuntu-latest
73+
if: >-
74+
(github.repository == 'llvm/llvm-project') &&
75+
!startswith(github.event.comment.body, '<!--IGNORE-->') &&
76+
contains(github.event.comment.body, '/branch ')
77+
78+
steps:
79+
- name: Fetch LLVM sources
80+
uses: actions/[email protected]
81+
with:
82+
persist-credentials: false
83+
84+
- name: Setup Environment
85+
run: |
86+
pip install -r ./llvm/utils/git/requirements.txt
87+
88+
- name: Create Pull Request
89+
run: |
90+
printf "%s" "$COMMENT_BODY" |
91+
./llvm/utils/git/github-automation.py \
92+
--repo "$GITHUB_REPOSITORY" \
93+
--token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
94+
release-workflow \
95+
--issue-number ${{ github.event.issue.number }} \
96+
--phab-token ${{ secrets.RELEASE_WORKFLOW_PHAB_TOKEN }} \
6997
auto

.github/workflows/issue-subscriber.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'llvm/llvm-project'
1515
steps:
1616
- name: Checkout Automation Script
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v4.1.7
1818
with:
1919
sparse-checkout: llvm/utils/git/
2020
ref: main

.github/workflows/libclang-abi-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
LLVM_VERSION_PATCH: ${{ steps.version.outputs.patch }}
3939
steps:
4040
- name: Checkout source
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v4.1.7
4242
with:
4343
fetch-depth: 250
4444

.github/workflows/libcxx-build-and-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
cc: 'gcc-14'
5656
cxx: 'g++-14'
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v4.1.7
5959
- name: ${{ matrix.config }}.${{ matrix.cxx }}
6060
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
6161
env:
@@ -101,7 +101,7 @@ jobs:
101101
cc: 'clang-19'
102102
cxx: 'clang++-19'
103103
steps:
104-
- uses: actions/checkout@v4
104+
- uses: actions/checkout@v4.1.7
105105
- name: ${{ matrix.config }}
106106
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
107107
env:
@@ -165,7 +165,7 @@ jobs:
165165
runs-on: ${{ matrix.machine }}
166166
container: ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698
167167
steps:
168-
- uses: actions/checkout@v4
168+
- uses: actions/checkout@v4.1.7
169169
- name: ${{ matrix.config }}
170170
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
171171
env:

.github/workflows/libcxx-check-generated-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Fetch LLVM sources
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v4.1.7
1616

1717
- name: Install dependencies
1818
uses: aminya/setup-cpp@v1

.github/workflows/llvm-project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
# actions/checkout deletes any existing files in the new git directory,
9292
# so this needs to either run before ccache-action or it has to use
9393
# clean: false.
94-
- uses: actions/checkout@v4
94+
- uses: actions/checkout@v4.1.7
9595
with:
9696
fetch-depth: 250
9797
- name: Setup ccache

.github/workflows/llvm-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
LLVM_VERSION_PATCH: ${{ steps.version.outputs.patch }}
3939
steps:
4040
- name: Checkout source
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v4.1.7
4242
with:
4343
fetch-depth: 250
4444

.github/workflows/new-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
(github.event.pull_request.author_association != 'OWNER')
3636
steps:
3737
- name: Checkout Automation Script
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v4.1.7
3939
with:
4040
sparse-checkout: llvm/utils/git/
4141
ref: main

0 commit comments

Comments
 (0)