From 96735cc9e71fa6d5c7ec470fcf55dd3ab1b2cd5a Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 19 May 2025 08:51:50 -0600 Subject: [PATCH 01/12] Test commit From c7fffb8762aa314fad8d30489e08faca8051f8a1 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 19 May 2025 08:51:51 -0600 Subject: [PATCH 02/12] Test commit From f684ed9eee10ef38968709ccc3f9e4a12eff36d2 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 19 May 2025 08:51:52 -0600 Subject: [PATCH 03/12] Test commit From e5819506ae2c1909f94ffcf08ad79fe2854540ba Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 19 May 2025 11:32:37 -0600 Subject: [PATCH 04/12] test From 66c1ae06a5b86c7c761bc7d01d9002612b0d9963 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 10:19:33 -0600 Subject: [PATCH 05/12] Test From 5902c8ddaaf1b909ea39b9df492eb182a59158dc Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 10:21:32 -0600 Subject: [PATCH 06/12] Create SSH directory Signed-off-by: Samuel E. Browne --- .github/workflows/ci-bridge.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-bridge.yml b/.github/workflows/ci-bridge.yml index f30a4a7344ef..a62147648f2f 100644 --- a/.github/workflows/ci-bridge.yml +++ b/.github/workflows/ci-bridge.yml @@ -7,25 +7,26 @@ on: jobs: sync: runs-on: ubuntu-latest + container: + image: ghcr.io/spack/ci-bridge:0.0.45 timeout-minutes: 20 # Terminate any running job after 20 minutes steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up environment variables + - name: Sync env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Replace with your secret name GITLAB_SSH_KEY_BASE64: ${{ secrets.SPACK_GITLAB_SSH_KEY }} # Replace with your secret name run: | echo "Setting up environment variables" # Decode the SSH key if necessary + mkdir ~/.ssh echo "${GITLAB_SSH_KEY_BASE64}" | base64 --decode > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - # Add GitLab to known hosts - ssh-keyscan gitlab.spack.io >> ~/.ssh/known_hosts - - - name: Sync - run: | - # Replace with the actual sync command - ./sync_script.sh "sebrowne/Trilinos" "ssh://git@ssh.gitlab.spack.io/sebrown/trilinos" "https://gitlab.spack.io" "sebrown/trilinos" "--sync-draft-prs" + #echo "Add GitLab to known hosts" + #ssh-keyscan gitlab.spack.io >> ~/.ssh/known_hosts + cd && ls -al + cd / && ls -al + python3 /scripts/SpackCIBridge.py "sebrowne/Trilinos" "ssh://git@ssh.gitlab.spack.io/sebrown/trilinos" "https://gitlab.spack.io" "sebrown/trilinos" "--sync-draft-prs" From 81a29a64c373f936a79f50cac8eb4b71fab54637 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 12:37:21 -0600 Subject: [PATCH 07/12] Test From c36769a0db15373987879a033aa9c880f5596328 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 12:38:35 -0600 Subject: [PATCH 08/12] Stop cloning Trilinos Signed-off-by: Samuel E. Browne --- .github/workflows/ci-bridge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci-bridge.yml b/.github/workflows/ci-bridge.yml index a62147648f2f..547f1f9aa202 100644 --- a/.github/workflows/ci-bridge.yml +++ b/.github/workflows/ci-bridge.yml @@ -12,9 +12,6 @@ jobs: timeout-minutes: 20 # Terminate any running job after 20 minutes steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Sync env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Replace with your secret name From ec26338967d906a4fcd502a2aebd19700bd65202 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 14:41:32 -0600 Subject: [PATCH 09/12] Add basic GCC and ROCm checks Signed-off-by: Samuel E. Browne --- .gitlab-ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000000..50e58d19ccfa --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,46 @@ +# This file is a template, and might need editing before it works on your project. +# This is a sample GitLab CI/CD configuration file that should run without any modifications. +# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts, +# it uses echo commands to simulate the pipeline execution. +# +# A pipeline is composed of independent jobs that run scripts, grouped into stages. +# Stages run in sequential order, but jobs within stages run in parallel. +# +# For more information, see: https://docs.gitlab.com/ee/ci/yaml/#stages +# +# You can copy and paste this template into a new `.gitlab-ci.yml` file. +# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword. +# +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/development/cicd/templates/ +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml + +stages: # List of stages for jobs, and their order of execution + - build + +gcc: + tags: + - cpu + - x86_64 + - docker + image: ghcr.io/trilinos/production/ubi8-gcc-8.3.0-serial:20250130 + stage: build + script: + - mkdir build + - pushd build + - bash -l -c "cmake -G Ninja -DTrilinos_ENABLE_Teuchos=ON -DTrilinos_ENABLE_TESTS=ON .." + - bash -l -c "ninja -j12" + - bash -l -c "ctest -j12" + +rocm: + tags: + - amd-mi300 + stage: build + image: ecpe4s/trilinos-ci-rocm6.2.1:2024.11.04 + script: + - mkdir build + - pushd build + - bash -l -c "cmake -G Ninja -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc -DTPL_ENABLE_MPI=ON -DTrilinos_ENABLE_Fortran=OFF -DTrilinos_ENABLE_Tpetra=ON -DTrilinos_ENABLE_TESTS=ON -DCMAKE_PREFIX_PATH=\"$(ls -d /usr/local/ci/pkgs/openblas*);/opt/rocm\" -DKokkos_ENABLE_HIP=ON -DKokkos_ARCH_AMD_GFX942=ON -DTpetra_INST_HIP=ON .." + - bash -l -c "ninja -j12" + - bash -l -c "ctest -j12 --output-on-failure" From 27640a578c88b3ee171449b48315fb3467b5faa3 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 4 Jun 2025 14:43:31 -0600 Subject: [PATCH 10/12] Test From 1294013d8d89b5c69d3193a52737579b07e75930 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 16 Jun 2025 07:31:08 -0600 Subject: [PATCH 11/12] Test commit From 7816157ca054798c5439c6a34a1dcaf7f6936ef3 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 16 Jun 2025 07:31:58 -0600 Subject: [PATCH 12/12] Migrate bridge to GitLab Signed-off-by: Samuel E. Browne --- .github/workflows/ci-bridge.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/ci-bridge.yml diff --git a/.github/workflows/ci-bridge.yml b/.github/workflows/ci-bridge.yml deleted file mode 100644 index 547f1f9aa202..000000000000 --- a/.github/workflows/ci-bridge.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Sync GitHub and GitLab - -on: - pull_request: - types: [opened, synchronize, reopened] - -jobs: - sync: - runs-on: ubuntu-latest - container: - image: ghcr.io/spack/ci-bridge:0.0.45 - timeout-minutes: 20 # Terminate any running job after 20 minutes - - steps: - - name: Sync - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Replace with your secret name - GITLAB_SSH_KEY_BASE64: ${{ secrets.SPACK_GITLAB_SSH_KEY }} # Replace with your secret name - run: | - echo "Setting up environment variables" - # Decode the SSH key if necessary - mkdir ~/.ssh - echo "${GITLAB_SSH_KEY_BASE64}" | base64 --decode > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - #echo "Add GitLab to known hosts" - #ssh-keyscan gitlab.spack.io >> ~/.ssh/known_hosts - cd && ls -al - cd / && ls -al - python3 /scripts/SpackCIBridge.py "sebrowne/Trilinos" "ssh://git@ssh.gitlab.spack.io/sebrown/trilinos" "https://gitlab.spack.io" "sebrown/trilinos" "--sync-draft-prs"