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

workflows/release-binaries: Always pull composite actions from main branch #100805

Merged
merged 2 commits into from
Jul 26, 2024
Merged

workflows/release-binaries: Always pull composite actions from main branch #100805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab486f0
workflows/release-binaries: Always pull composite actions from main b…
tstellar Jul 26, 2024
4040672
Hashpin checkout action
tstellar Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .github/workflows/release-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,20 @@ jobs:
if: github.repository == 'llvm/llvm-project'
runs-on: ${{ inputs.runs-on }}
steps:

- name: Checkout Actions
uses: actions/checkout@@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ (github.event_name == 'pull_request' && github.sha) || 'main' }}
sparse-checkout: |
.github/workflows/
sparse-checkout-cone-mode: false
path: workflows

- name: Setup Stage
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 assuming this moved up here so it can use the just pulled in action definition?

The subsequent LLVM checkout ends up overriding this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The next checkout won't override this, so I didn't have to move this. The reason I did was to match the other stages which have these two steps next to each other.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense.

For some reason I missed the path argument in my initial readover. This makes more sense now.

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 was wrong, the checkout does overwrite this. See #100845.

id: setup-stage
uses: ./workflows/.github/workflows/release-binaries-setup-stage

- name: Checkout LLVM
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
Expand All @@ -161,10 +175,6 @@ jobs:
key: sccache-${{ runner.os }}-${{ runner.arch }}-release
variant: sccache

- name: Setup Stage
id: setup-stage
uses: ./.github/workflows/release-binaries-setup-stage

- name: Build Stage 1 Clang
id: build
shell: bash
Expand All @@ -184,7 +194,7 @@ jobs:
ls -ltr ${{ steps.setup-stage.outputs.build-prefix }}/build

- name: Save Stage
uses: ./.github/workflows/release-binaries-save-stage
uses: ./workflows/.github/workflows/release-binaries-save-stage
with:
build-prefix: ${{ steps.setup-stage.outputs.build-prefix }}

Expand Down
Loading