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

[workflows] Stop using the build-test-llvm-project action #80580

Merged
merged 1 commit into from
Feb 4, 2024

Conversation

tstellar
Copy link
Collaborator

@tstellar tstellar commented Feb 4, 2024

This action is really just a wrapper around cmake and ninja. It doesn't add any value to the builds, and I don't think we need it now that there are reusable workflows.

This action is really just a wrapper around cmake and ninja.  It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.
@llvmbot
Copy link
Collaborator

llvmbot commented Feb 4, 2024

@llvm/pr-subscribers-github-workflow

Author: Tom Stellard (tstellar)

Changes

This action is really just a wrapper around cmake and ninja. It doesn't add any value to the builds, and I don't think we need it now that there are reusable workflows.


Full diff: https://github.com/llvm/llvm-project/pull/80580.diff

1 Files Affected:

  • (modified) .github/workflows/llvm-project-tests.yml (+13-4)
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 91d0b258394ef..79a382bfa4f9a 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -98,14 +98,23 @@ jobs:
           key: ${{ matrix.os }}
           variant: sccache
       - name: Build and Test
-        uses: llvm/actions/build-test-llvm-project@main
         env:
           # Workaround for https://github.com/actions/virtual-environments/issues/5900.
           # This should be a no-op for non-mac OSes
           PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
-        with:
-          cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ${{ inputs.extra_cmake_args }}'
-          build_target: '${{ inputs.build_target }}'
+        shell: bash
+        run: |
+          cmake -G Ninja \
+                -B build \
+                -S llvm \
+                -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DLLVM_ENABLE_ASSERTIONS=ON \
+                -DLLDB_INCLUDE_TESTS=OFF \
+                -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+                -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
+                ${{ inputs.extra_cmake_args }}
+          ninja -C build '${{ inputs.build_target }}'
 
       - name: Build and Test libclc
         if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"

Copy link
Contributor

@boomanaiden154 boomanaiden154 left a comment

Choose a reason for hiding this comment

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

LGTM. This is definitely a nice simplification. I'm assuming there will be another commit/PR in https://github.com/llvm/actions to delete this action since it won't be needed any longer?

@tstellar
Copy link
Collaborator Author

tstellar commented Feb 4, 2024

LGTM. This is definitely a nice simplification. I'm assuming there will be another commit/PR in https://github.com/llvm/actions to delete this action since it won't be needed any longer?

Yeah, I can remove it from there too.

@tstellar tstellar merged commit d25022b into llvm:main Feb 4, 2024
6 of 7 checks passed
@tstellar
Copy link
Collaborator Author

tstellar commented Feb 4, 2024

/cherry-pick d25022b

@tstellar tstellar added this to the LLVM 18.X Release milestone Feb 4, 2024
llvmbot pushed a commit to llvmbot/llvm-project that referenced this pull request Feb 4, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
@llvmbot
Copy link
Collaborator

llvmbot commented Feb 4, 2024

/pull-request #80584

agozillon pushed a commit to agozillon/llvm-project that referenced this pull request Feb 5, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.
tstellar added a commit to tstellar/llvm-project that referenced this pull request Feb 6, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
tstellar added a commit to tstellar/llvm-project that referenced this pull request Feb 8, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
tstellar added a commit that referenced this pull request Feb 8, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
tstellar added a commit to tstellar/llvm-project that referenced this pull request Feb 14, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
tstellar added a commit to tstellar/llvm-project that referenced this pull request Feb 14, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
tstellar added a commit to tstellar/llvm-project that referenced this pull request Feb 14, 2024
This action is really just a wrapper around cmake and ninja. It doesn't
add any value to the builds, and I don't think we need it now that there
are reusable workflows.

(cherry picked from commit d25022b)
@pointhex pointhex mentioned this pull request May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

3 participants