From 713fedf806bb680e751339ef757d1781a27a4a6b Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 10:26:41 -0400 Subject: [PATCH 01/55] adding github action to install mesa --- .github/actions/install-mesa/actions.yml | 108 +++++++++++++++++++++++ .github/workflows/build-linux.yml | 96 +------------------- 2 files changed, 111 insertions(+), 93 deletions(-) create mode 100644 .github/actions/install-mesa/actions.yml diff --git a/.github/actions/install-mesa/actions.yml b/.github/actions/install-mesa/actions.yml new file mode 100644 index 000000000..f9b72236c --- /dev/null +++ b/.github/actions/install-mesa/actions.yml @@ -0,0 +1,108 @@ +name : 'install-mesa' + +description: 'Download and install the MESA SDK and MESA' + +inputs: + sdk: + description: 'The version of the MESA SDK to install' + required: false + default: '23.7.3' + +runs: + + using: 'composite' + + steps: + - name: Delete unused packages + run: | + # runners have 150GB of disk space and the Ubuntu image is big so we sometimes found it ran out of space for MESA + # others have encountered this too so we took commands from this action + # https://github.com/jlumbroso/free-disk-space + # currently commented because we don't need it and these commands can need changing when the Ubuntu image changes + sudo rm -rf /usr/local/lib/android + # sudo apt-get remove -y '^aspnetcore-.*' + # sudo apt-get remove -y '^dotnet-.*' # 990 MB + # sudo apt-get remove -y '^llvm-.*' # 1052 MB + # sudo apt-get remove -y 'php.*' # 56.6 MB + # sudo apt-get remove -y '^mysql-.*' # 209 MB + # sudo apt-get remove -y azure-cli google-cloud-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri # 2274 MB + sudo apt-get autoremove -y # 771 MB + sudo apt-get clean + + - name: Checkout + uses: actions/checkout@v3.0.0 + + - name: Create LFS file list + run: | + git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id + + - name: Restore LFS cache + uses: actions/cache@v3 + id: lfs-cache + with: + path: .git/lfs + key: ${{ runner.os }}-${{ hashFiles('.lfs-assets-id') }}-v1 + + - name: Git LFS Pull + run: git lfs pull + if: steps.lfs-cache.outputs.cache-hit != 'true' + + - name: Git LFS Checkout + run: git lfs checkout + if: steps.lfs-cache.outputs.cache-hit == 'true' + + - name: Install dependencies Linux + run: | + sudo apt-get -y update + sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh + shell: bash + + - uses: actions/cache@v3 + id: cache + with: + path: | + mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + key: ${{ runner.os }}-${{inputs.sdk}} + + - name: Get SDK ${{ runner.os }} '21.4.1' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '21.4.1') }} + run: | + wget -q https://zenodo.org/record/5802444/files/mesasdk-x86_64-linux-21.4.1.tar.gz + shell: bash + + - name: Get SDK ${{ runner.os }} '22.6.1' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '22.6.1') }} + run: | + wget -q https://zenodo.org/record/7457681/files/mesasdk-x86_64-linux-22.6.1.tar.gz + shell: bash + + - name: Get SDK ${{ runner.os }} '23.7.3' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '23.7.3') }} + run: | + wget -q https://zenodo.org/record/10624843/files/mesasdk-x86_64-linux-23.7.3.tar.gz + shell: bash + + - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} + run: | + tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + shell: bash + + - name: Compile + shell: bash + run: | + # Linux runners have 4 cores + # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + export OMP_NUM_THREADS=4 + export NPROCS=4 + export "MESASDK_ROOT=$(readlink -f mesasdk)" + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + export "MESA_DIR=$(readlink -f ./)" + # Everything is run as root so we need to disable the root check in the install script + sed -i 's/\${EUID:-\$(id -u)}/1/' install + # Turn off caching during build to save more space + sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 + sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 + ./install + if [ ! -f lib/libbinary.a ]; then + exit 1 + fi diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 789f52197..4716a1609 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -12,97 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Delete unused packages - run: | - # runners have 150GB of disk space and the Ubuntu image is big so we sometimes found it ran out of space for MESA - # others have encountered this too so we took commands from this action - # https://github.com/jlumbroso/free-disk-space - # currently commented because we don't need it and these commands can need changing when the Ubuntu image changes - sudo rm -rf /usr/local/lib/android - # sudo apt-get remove -y '^aspnetcore-.*' - # sudo apt-get remove -y '^dotnet-.*' # 990 MB - # sudo apt-get remove -y '^llvm-.*' # 1052 MB - # sudo apt-get remove -y 'php.*' # 56.6 MB - # sudo apt-get remove -y '^mysql-.*' # 209 MB - # sudo apt-get remove -y azure-cli google-cloud-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri # 2274 MB - sudo apt-get autoremove -y # 771 MB - sudo apt-get clean - - - name: Checkout - uses: actions/checkout@v3.0.0 - - - name: Create LFS file list - run: | - git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id - - - name: Restore LFS cache - uses: actions/cache@v3 - id: lfs-cache - with: - path: .git/lfs - key: ${{ runner.os }}-${{ hashFiles('.lfs-assets-id') }}-v1 - - - name: Git LFS Pull - run: git lfs pull - if: steps.lfs-cache.outputs.cache-hit != 'true' - - - name: Git LFS Checkout - run: git lfs checkout - if: steps.lfs-cache.outputs.cache-hit == 'true' - - - name: Install dependencies Linux - run: | - sudo apt-get -y update - sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh - shell: bash - - - uses: actions/cache@v3 - id: cache + - name: Install MESA on ${{ runner.os }} with SDK ${{matrix.sdk}} + uses: ./.github/actions/install-mesa with: - path: | - mesasdk-x86_64-linux-${{matrix.sdk}}.tar.gz - key: ${{ runner.os }}-${{matrix.sdk}} - - - - name: Get SDK ${{ runner.os }} '21.4.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( matrix.sdk == '21.4.1') }} - run: | - wget -q https://zenodo.org/record/5802444/files/mesasdk-x86_64-linux-21.4.1.tar.gz - shell: bash - - - name: Get SDK ${{ runner.os }} '22.6.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( matrix.sdk == '22.6.1') }} - run: | - wget -q https://zenodo.org/record/7457681/files/mesasdk-x86_64-linux-22.6.1.tar.gz - shell: bash - - - name: Get SDK ${{ runner.os }} '23.7.3' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( matrix.sdk == '23.7.3') }} - run: | - wget -q https://zenodo.org/record/10624843/files/mesasdk-x86_64-linux-23.7.3.tar.gz - shell: bash - - - name: Unpack SDK ${{ runner.os }} ${{matrix.sdk}} - run: | - tar xvf mesasdk-x86_64-linux-${{matrix.sdk}}.tar.gz - shell: bash - - - name: Compile - shell: bash - run: | - # Linux runners have 4 cores - # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories - export OMP_NUM_THREADS=4 - export NPROCS=4 - export "MESASDK_ROOT=$(readlink -f mesasdk)" - source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - export "MESA_DIR=$(readlink -f ./)" - # Everything is run as root so we need to disable the root check in the install script - sed -i 's/\${EUID:-\$(id -u)}/1/' install - # Turn off caching during build to save more space - sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 - sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - ./install - if [ ! -f lib/libbinary.a ]; then - exit 1 - fi + sdk: ${{matrix.sdk}} From e6096cd873d8988ae592e2d7af6863d006098aed Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 10:30:11 -0400 Subject: [PATCH 02/55] rename --- .github/actions/install-mesa/{actions.yml => action.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/actions/install-mesa/{actions.yml => action.yml} (100%) diff --git a/.github/actions/install-mesa/actions.yml b/.github/actions/install-mesa/action.yml similarity index 100% rename from .github/actions/install-mesa/actions.yml rename to .github/actions/install-mesa/action.yml From ac0e5c1d58c8d35c48c94bae07ff3d911e6811ec Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 10:53:13 -0400 Subject: [PATCH 03/55] switch checkout --- .github/actions/install-mesa/action.yml | 11 ++++------- .github/workflows/build-linux.yml | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index f9b72236c..01aae1755 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -1,6 +1,6 @@ name : 'install-mesa' -description: 'Download and install the MESA SDK and MESA' +description: 'Download and install the MESA SDK and install MESA' inputs: sdk: @@ -29,15 +29,12 @@ runs: sudo apt-get autoremove -y # 771 MB sudo apt-get clean - - name: Checkout - uses: actions/checkout@v3.0.0 - - name: Create LFS file list run: | git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id - name: Restore LFS cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: lfs-cache with: path: .git/lfs @@ -57,7 +54,7 @@ runs: sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh shell: bash - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache with: path: | @@ -84,7 +81,7 @@ runs: - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} run: | - tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz shell: bash - name: Compile diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 4716a1609..620d10d8b 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -12,6 +12,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install MESA on ${{ runner.os }} with SDK ${{matrix.sdk}} uses: ./.github/actions/install-mesa with: From 7a174eb0fcddf527e86cc4dd0524302b3a6009c5 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 10:58:08 -0400 Subject: [PATCH 04/55] adding shell --- .github/actions/install-mesa/action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 01aae1755..23016a1d1 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -28,10 +28,12 @@ runs: # sudo apt-get remove -y azure-cli google-cloud-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri # 2274 MB sudo apt-get autoremove -y # 771 MB sudo apt-get clean + shell: bash - name: Create LFS file list run: | git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id + shell: bash - name: Restore LFS cache uses: actions/cache@v4 @@ -42,10 +44,12 @@ runs: - name: Git LFS Pull run: git lfs pull + shell: bash if: steps.lfs-cache.outputs.cache-hit != 'true' - name: Git LFS Checkout run: git lfs checkout + shell: bash if: steps.lfs-cache.outputs.cache-hit == 'true' - name: Install dependencies Linux @@ -85,7 +89,6 @@ runs: shell: bash - name: Compile - shell: bash run: | # Linux runners have 4 cores # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories @@ -103,3 +106,4 @@ runs: if [ ! -f lib/libbinary.a ]; then exit 1 fi + shell: bash From a037d3b38021658152e2dad3cae22918f8a27c31 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 11:37:45 -0400 Subject: [PATCH 05/55] try add a test-mesa --- .github/workflows/test-mesa.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/test-mesa.yml diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml new file mode 100644 index 000000000..dfa1dabb9 --- /dev/null +++ b/.github/workflows/test-mesa.yml @@ -0,0 +1,31 @@ +name: Test Mesa + +on: [pull_request, release] + +jobs: + test_mesa: + strategy: + fail-fast: false + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 + uses: ./.github/actions/install-mesa + with: + sdk: "23.7.3" + + - name: Checkout mesa_test + uses: actions/checkout@v4 + with: + repository: 'mesa/mesa_test' + ref: 'main' + + - name: Install mesa_test + run: | + gem install mesa_test + shell: bash + From dd07e38dcf812f96047d6ae6d0eb5a4f7d8872a5 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 12:18:59 -0400 Subject: [PATCH 06/55] progress on yaml file --- .github/workflows/test-mesa.yml | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index dfa1dabb9..61f94cae6 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -28,4 +28,40 @@ jobs: run: | gem install mesa_test shell: bash + + - name: Create config file + run: | + MESA_TEST_YML=$MESA_DIR/.mesa_test/config.yml + echo "---" > $MESA_TEST_YML + echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML + echo "email: XXX" >> $MESA_TEST_YML + echo "password: XXX" >> $MESA_TEST_YML + echo "logs_token: XXX" >> $MESA_TEST_YML + echo "github_protocol: :ssh" >> $MESA_TEST_YML + echo "mesa_mirror: $MESA_DIR/mirror" >> $MESA_TEST_YML + echo "mesa_work: $MESA_DIR" >> $MESA_TEST_YML + echo "platform: Linux" >> $MESA_TEST_YML + echo "platform_version: Ubuntu" >> $MESA_TEST_YML + mesa_test install --no-checkout + mesa_test submit --empty + shell: bash + + - name: Test Problem 13 + run: | + mesa_test test 13 + shell: bash + + - name: Test Problem 15 + run: | + mesa_test test 15 + shell: bash + - name: Test Problem 29 + run: | + mesa_test test 29 + shell: bash + + - name: Test Problem 41 + run: | + mesa_test test 41 + shell: bash From e40fc146521a1572161c4de76a56640955209b04 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 12:33:27 -0400 Subject: [PATCH 07/55] [ci skip] partial progress --- .github/workflows/test-mesa.yml | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 61f94cae6..31bbe28c6 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout mesa_test uses: actions/checkout@v4 with: - repository: 'mesa/mesa_test' + repository: 'MESAHub/mesa_test' ref: 'main' - name: Install mesa_test @@ -42,26 +42,26 @@ jobs: echo "mesa_work: $MESA_DIR" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - mesa_test install --no-checkout - mesa_test submit --empty + # mesa_test install --no-checkout + # mesa_test submit --empty shell: bash - - name: Test Problem 13 - run: | - mesa_test test 13 - shell: bash + #- name: Test Problem 13 + # run: | + # mesa_test test 13 + # shell: bash - - name: Test Problem 15 - run: | - mesa_test test 15 - shell: bash - - - name: Test Problem 29 - run: | - mesa_test test 29 - shell: bash + #- name: Test Problem 15 + # run: | + # mesa_test test 15 + # shell: bash + # + #- name: Test Problem 29 + # run: | + # mesa_test test 29 + # shell: bash - - name: Test Problem 41 - run: | - mesa_test test 41 - shell: bash + #- name: Test Problem 41 + # run: | + # mesa_test test 41 + # shell: bash From 3fcf1c5daaa58cfbef04fba5330268539a686279 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 13:24:41 -0400 Subject: [PATCH 08/55] yml --- .github/workflows/test-mesa.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 31bbe28c6..058ccc04c 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -34,9 +34,9 @@ jobs: MESA_TEST_YML=$MESA_DIR/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: XXX" >> $MESA_TEST_YML - echo "password: XXX" >> $MESA_TEST_YML - echo "logs_token: XXX" >> $MESA_TEST_YML + echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML + echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML + echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML echo "mesa_mirror: $MESA_DIR/mirror" >> $MESA_TEST_YML echo "mesa_work: $MESA_DIR" >> $MESA_TEST_YML From 8533ea7db3c02c4e86a8a330252229bcf323698d Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 14:00:34 -0400 Subject: [PATCH 09/55] change checkout --- .github/workflows/test-mesa.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 058ccc04c..18484809e 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -19,14 +19,15 @@ jobs: sdk: "23.7.3" - name: Checkout mesa_test - uses: actions/checkout@v4 - with: - repository: 'MESAHub/mesa_test' - ref: 'main' + run: | + git clone git@github.com:MESAHub/mesa_test.git + shell: bash - name: Install mesa_test run: | + cd mesa_test/ gem install mesa_test + cd ../ shell: bash - name: Create config file From 35f3c3d102dff366690cdd599d8832f0f6183e55 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 14:51:11 -0400 Subject: [PATCH 10/55] install mesa test --- .github/workflows/test-mesa.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 18484809e..195379f1f 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -19,15 +19,18 @@ jobs: sdk: "23.7.3" - name: Checkout mesa_test - run: | - git clone git@github.com:MESAHub/mesa_test.git - shell: bash + uses: actions/checkout@v4 + with: + repository: MESAHub/mesa_test + path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - name: Install mesa_test run: | - cd mesa_test/ + cd $GITHUB_WORKSPACE/mesa_test gem install mesa_test - cd ../ + cd $GITHUB_WORKSPACE + pwd + ls -l shell: bash - name: Create config file From 16c9fb43e60a08ba4f343882b2c5e9934e5b3c70 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 14:54:25 -0400 Subject: [PATCH 11/55] add more info --- .github/workflows/test-mesa.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 195379f1f..886ca459c 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -30,7 +30,9 @@ jobs: gem install mesa_test cd $GITHUB_WORKSPACE pwd - ls -l + echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" + echo "MESA_DIR=$MESA_DIR" + ls -la shell: bash - name: Create config file @@ -46,8 +48,8 @@ jobs: echo "mesa_work: $MESA_DIR" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - # mesa_test install --no-checkout - # mesa_test submit --empty + mesa_test install --no-checkout + mesa_test submit --empty shell: bash #- name: Test Problem 13 From 9dbd65ce6c5b0c220ff8d734979a44667b4550a1 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 15:12:37 -0400 Subject: [PATCH 12/55] sudo --- .github/workflows/test-mesa.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 886ca459c..ac70104ac 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -27,7 +27,8 @@ jobs: - name: Install mesa_test run: | cd $GITHUB_WORKSPACE/mesa_test - gem install mesa_test + ls -la + sudo gem install mesa_test cd $GITHUB_WORKSPACE pwd echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" From 7f23fbe799e7e1d9ece1c4e0e81974b8bb5a80c7 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 15:53:37 -0400 Subject: [PATCH 13/55] env vars --- .github/actions/install-mesa/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 23016a1d1..83a49192c 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -92,18 +92,18 @@ runs: run: | # Linux runners have 4 cores # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories - export OMP_NUM_THREADS=4 - export NPROCS=4 - export "MESASDK_ROOT=$(readlink -f mesasdk)" + echo "OMP_NUM_THREADS=4" >> $GITHUB_ENV + echo "NPROCS=4" >> $GITHUB_ENV + echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - export "MESA_DIR=$(readlink -f ./)" + echo "MESA_DIR=$(readlink -f ./)" >> $GITHUB_ENV # Everything is run as root so we need to disable the root check in the install script sed -i 's/\${EUID:-\$(id -u)}/1/' install # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - ./install - if [ ! -f lib/libbinary.a ]; then - exit 1 - fi + # ./install + # if [ ! -f lib/libbinary.a ]; then + # exit 1 + # fi shell: bash From d2e6ce5602a5b3a5cc33ef8516f36b98ffc6c725 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:01:58 -0400 Subject: [PATCH 14/55] paths --- .github/actions/install-mesa/action.yml | 12 ++++++++---- .github/workflows/test-mesa.yml | 11 ++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 83a49192c..bc6308c21 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -92,11 +92,15 @@ runs: run: | # Linux runners have 4 cores # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories - echo "OMP_NUM_THREADS=4" >> $GITHUB_ENV - echo "NPROCS=4" >> $GITHUB_ENV - echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV + export OMP_NUM_THREADS=4 + export NPROCS=4 + export "MESASDK_ROOT=$(readlink -f mesasdk)" source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - echo "MESA_DIR=$(readlink -f ./)" >> $GITHUB_ENV + export "MESA_DIR=$(readlink -f ./)" + echo "OMP_NUM_THREADS=${OMP_NUM_THREADS}" >> $GITHUB_ENV + echo "NPROCS=${NPROCS}" >> $GITHUB_ENV + echo "MESASDK_ROOT=${MESASDK_ROOT}" >> $GITHUB_ENV + echo "MESA_DIR=${MESASDK_ROOT}" >> $GITHUB_ENV # Everything is run as root so we need to disable the root check in the install script sed -i 's/\${EUID:-\$(id -u)}/1/' install # Turn off caching during build to save more space diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index ac70104ac..347c5e2c7 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -27,26 +27,23 @@ jobs: - name: Install mesa_test run: | cd $GITHUB_WORKSPACE/mesa_test - ls -la sudo gem install mesa_test cd $GITHUB_WORKSPACE pwd - echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" - echo "MESA_DIR=$MESA_DIR" - ls -la + ls -la .. shell: bash - name: Create config file run: | - MESA_TEST_YML=$MESA_DIR/.mesa_test/config.yml + MESA_TEST_YML=$GITHUB_WORKSPACE/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML - echo "mesa_mirror: $MESA_DIR/mirror" >> $MESA_TEST_YML - echo "mesa_work: $MESA_DIR" >> $MESA_TEST_YML + echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML + echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML mesa_test install --no-checkout From 92874584e4090c7a12eb5d23d140763266fd47df Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:09:35 -0400 Subject: [PATCH 15/55] mkdir --- .github/workflows/test-mesa.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 347c5e2c7..2819139ec 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -29,8 +29,15 @@ jobs: cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE + mkdir .mesa_test pwd + echo "XXX" ls -la .. + echo "XXX" + ls -la + echo "XXX" + ls -la mesa_test + echo "XXX" shell: bash - name: Create config file From f228a154be8ed0f9b0efe52ff2a896cb733b8f39 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:17:35 -0400 Subject: [PATCH 16/55] paths --- .github/workflows/test-mesa.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 2819139ec..b081d395f 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -29,9 +29,11 @@ jobs: cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE - mkdir .mesa_test + echo $GITHUB_WORKSPACE pwd echo "XXX" + ls -la ../ii + echo "XXX" ls -la .. echo "XXX" ls -la @@ -42,7 +44,7 @@ jobs: - name: Create config file run: | - MESA_TEST_YML=$GITHUB_WORKSPACE/.mesa_test/config.yml + MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML From 47823e5abd90142df9d2cfa1045b9ba127fc78e2 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:20:44 -0400 Subject: [PATCH 17/55] typo --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index b081d395f..815182f20 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -32,7 +32,7 @@ jobs: echo $GITHUB_WORKSPACE pwd echo "XXX" - ls -la ../ii + ls -la ../.. echo "XXX" ls -la .. echo "XXX" From f0009b201d98290365723d1e532907f6d0e80280 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:28:39 -0400 Subject: [PATCH 18/55] paths --- .github/workflows/test-mesa.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 815182f20..23cf9cc27 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -26,10 +26,14 @@ jobs: - name: Install mesa_test run: | + cd + pwd + ls -la cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE echo $GITHUB_WORKSPACE + mkdir .mesa_test pwd echo "XXX" ls -la ../.. @@ -44,7 +48,7 @@ jobs: - name: Create config file run: | - MESA_TEST_YML=/home/runner/.mesa_test/config.yml + MESA_TEST_YML=$GITHUB_WORKSPACE/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML From 8ca41f89c7a997b889326fdb83378fb1c71e5441 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:35:33 -0400 Subject: [PATCH 19/55] more paths --- .github/actions/install-mesa/action.yml | 2 +- .github/workflows/test-mesa.yml | 21 ++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index bc6308c21..1e7d95bfd 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -100,7 +100,7 @@ runs: echo "OMP_NUM_THREADS=${OMP_NUM_THREADS}" >> $GITHUB_ENV echo "NPROCS=${NPROCS}" >> $GITHUB_ENV echo "MESASDK_ROOT=${MESASDK_ROOT}" >> $GITHUB_ENV - echo "MESA_DIR=${MESASDK_ROOT}" >> $GITHUB_ENV + echo "MESA_DIR=${MESA_DIR}" >> $GITHUB_ENV # Everything is run as root so we need to disable the root check in the install script sed -i 's/\${EUID:-\$(id -u)}/1/' install # Turn off caching during build to save more space diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 23cf9cc27..fa48f6cc1 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -24,31 +24,18 @@ jobs: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - - name: Install mesa_test + - name: Install mesa_test and create config file run: | - cd - pwd - ls -la cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE - echo $GITHUB_WORKSPACE - mkdir .mesa_test - pwd - echo "XXX" - ls -la ../.. - echo "XXX" - ls -la .. - echo "XXX" - ls -la - echo "XXX" - ls -la mesa_test - echo "XXX" shell: bash - name: Create config file run: | - MESA_TEST_YML=$GITHUB_WORKSPACE/.mesa_test/config.yml + echo ${{ runner.home }} + mkdir ${{ runner.home }}/.mesa_test + MESA_TEST_YML={{ runner.home }}/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML From 5b4f49ed4c0922742f4919b8949794a7969d702b Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:43:09 -0400 Subject: [PATCH 20/55] paths --- .github/workflows/test-mesa.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index fa48f6cc1..dea0364d0 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -33,9 +33,8 @@ jobs: - name: Create config file run: | - echo ${{ runner.home }} - mkdir ${{ runner.home }}/.mesa_test - MESA_TEST_YML={{ runner.home }}/.mesa_test/config.yml + mkdir /home/runner/.mesa_test + MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML From fa46223506318e997f34f39592947a84fb9283b1 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 16:48:01 -0400 Subject: [PATCH 21/55] paths --- .github/workflows/test-mesa.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index dea0364d0..fb1ad65e6 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -33,6 +33,10 @@ jobs: - name: Create config file run: | + export OMP_NUM_THREADS=${{env.OMP_NUM_THREADS}} + export NPROCS=${{env.NPROCS}} + export MESASDK_ROOT=${{env.MESASDK_ROOT}} + export MESA_DIR=${{env.MESA_DIR}} mkdir /home/runner/.mesa_test MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML @@ -45,7 +49,9 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML + echo "XXX" mesa_test install --no-checkout + echo "XXXXX" mesa_test submit --empty shell: bash From cb1b7eb4987497abe1c73c7e892125be30c3931b Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 17:26:19 -0400 Subject: [PATCH 22/55] env --- .github/actions/install-mesa/action.yml | 14 ++++++++++---- .github/workflows/test-mesa.yml | 11 +++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 1e7d95bfd..22c4339b9 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -7,6 +7,10 @@ inputs: description: 'The version of the MESA SDK to install' required: false default: '23.7.3' + do_install: + description: 'Perform the final MESA installation after setting up SDK and environment' + required: false + default: 'true' runs: @@ -106,8 +110,10 @@ runs: # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - # ./install - # if [ ! -f lib/libbinary.a ]; then - # exit 1 - # fi + if [${{inputs.do_install}} = "true"]; then + ./install + if [ ! -f lib/libbinary.a ]; then + exit 1 + fi + fi shell: bash diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index fb1ad65e6..5e13f97af 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -17,6 +17,7 @@ jobs: uses: ./.github/actions/install-mesa with: sdk: "23.7.3" + do_install: "false" # Skip install - name: Checkout mesa_test uses: actions/checkout@v4 @@ -26,6 +27,7 @@ jobs: - name: Install mesa_test and create config file run: | + # Setup mesa_test cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE @@ -50,15 +52,16 @@ jobs: echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML echo "XXX" + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" mesa_test install --no-checkout echo "XXXXX" mesa_test submit --empty shell: bash - #- name: Test Problem 13 - # run: | - # mesa_test test 13 - # shell: bash + - name: Test Problem 13 + run: | + mesa_test test 13 + shell: bash #- name: Test Problem 15 # run: | From 219d741fbadd41c77c079efb8d92e379935ef0af Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 17:33:50 -0400 Subject: [PATCH 23/55] simplifiy --- .github/actions/install-mesa/action.yml | 1 + .github/workflows/test-mesa.yml | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 22c4339b9..9b3d907c7 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -101,6 +101,7 @@ runs: export "MESASDK_ROOT=$(readlink -f mesasdk)" source "${MESASDK_ROOT}/bin/mesasdk_init.sh" export "MESA_DIR=$(readlink -f ./)" + # Save environment variables to Github environment echo "OMP_NUM_THREADS=${OMP_NUM_THREADS}" >> $GITHUB_ENV echo "NPROCS=${NPROCS}" >> $GITHUB_ENV echo "MESASDK_ROOT=${MESASDK_ROOT}" >> $GITHUB_ENV diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 5e13f97af..f65dfd9b1 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -17,7 +17,7 @@ jobs: uses: ./.github/actions/install-mesa with: sdk: "23.7.3" - do_install: "false" # Skip install + do_install: "false" # Skip install because mesa_test will do this - name: Checkout mesa_test uses: actions/checkout@v4 @@ -31,10 +31,6 @@ jobs: cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE - shell: bash - - - name: Create config file - run: | export OMP_NUM_THREADS=${{env.OMP_NUM_THREADS}} export NPROCS=${{env.NPROCS}} export MESASDK_ROOT=${{env.MESASDK_ROOT}} @@ -51,10 +47,8 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - echo "XXX" source "${MESASDK_ROOT}/bin/mesasdk_init.sh" mesa_test install --no-checkout - echo "XXXXX" mesa_test submit --empty shell: bash From 6e29c08048fd343881234a28b0ffaeb27846dc50 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 17:36:32 -0400 Subject: [PATCH 24/55] fix shell str compare --- .github/actions/install-mesa/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 9b3d907c7..70ef319f4 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -111,7 +111,7 @@ runs: # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - if [${{inputs.do_install}} = "true"]; then + if [[${{inputs.do_install}} =] "true"]]; then ./install if [ ! -f lib/libbinary.a ]; then exit 1 From 43c3e6fe9ca695eecebc3a72a7a217ec0d623726 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 17:43:33 -0400 Subject: [PATCH 25/55] typo --- .github/actions/install-mesa/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 70ef319f4..e64bcd4de 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -111,7 +111,7 @@ runs: # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - if [[${{inputs.do_install}} =] "true"]]; then + if [[${{inputs.do_install}} == "true"]]; then ./install if [ ! -f lib/libbinary.a ]; then exit 1 From 2a64f4c07096d817fd1c42d96d2ee7914c55734d Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 17:54:03 -0400 Subject: [PATCH 26/55] str cmp --- .github/actions/install-mesa/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index e64bcd4de..e2d8425c3 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -111,7 +111,7 @@ runs: # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - if [[${{inputs.do_install}} == "true"]]; then + if [ ${{inputs.do_install}} = "true" ]; then ./install if [ ! -f lib/libbinary.a ]; then exit 1 From 0ace945230826467f8faf1908df0f5efcefecef0 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 18:18:05 -0400 Subject: [PATCH 27/55] space --- .github/workflows/test-mesa.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index f65dfd9b1..6ebad6b00 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -39,9 +39,9 @@ jobs: MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML - echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML - echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML + echo "email: ${{secrets.MESA_TEST_EMAIL}}" >> $MESA_TEST_YML + echo "password: ${{secrets.MESA_TEST_PASSWORD}}" >> $MESA_TEST_YML + echo "logs_token: ${{secrets.MESA_TEST_LOGS_TOKEN}}" >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML From 680709fd9a8c1f1def6559bbbb46a3f54bbc1c01 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 20:58:35 -0400 Subject: [PATCH 28/55] fix echo --- .github/workflows/test-mesa.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 6ebad6b00..c8cf882de 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -39,9 +39,9 @@ jobs: MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: ${{secrets.MESA_TEST_EMAIL}}" >> $MESA_TEST_YML - echo "password: ${{secrets.MESA_TEST_PASSWORD}}" >> $MESA_TEST_YML - echo "logs_token: ${{secrets.MESA_TEST_LOGS_TOKEN}}" >> $MESA_TEST_YML + echo "email: ${{secrets.MESA_TEST_EMAIL}}" | sed 's/./& /g' >> $MESA_TEST_YML + echo "password: ${{secrets.MESA_TEST_PASSWORD}}" | sed 's/./& /g' >> $MESA_TEST_YML + echo "logs_token: ${{secrets.MESA_TEST_LOGS_TOKEN}}" | sed 's/./& /g' >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML From 58b3ac75809e5c22b05ed2379707f159daf3f262 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:19:41 -0400 Subject: [PATCH 29/55] test --- .github/workflows/test-mesa.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index c8cf882de..5fe19ba6f 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -48,13 +48,14 @@ jobs: echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - mesa_test install --no-checkout + echo "${{secrets.MESA_TEST_EMAIL}}" | sed 's/./& /g' + # XXXmesa_test install --no-checkout mesa_test submit --empty shell: bash - name: Test Problem 13 run: | - mesa_test test 13 + # XXXmesa_test test 13 shell: bash #- name: Test Problem 15 From 07df484ca59a380e8676f3e83bf4ec6f9d9325be Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:31:12 -0400 Subject: [PATCH 30/55] echo --- .github/workflows/test-mesa.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 5fe19ba6f..3e5cea5a1 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -48,7 +48,8 @@ jobs: echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - echo "${{secrets.MESA_TEST_EMAIL}}" | sed 's/./& /g' + echo "XXX" + echo ${{secrets.MESA_TEST_EMAIL}} | sed 's/./& /g' # XXXmesa_test install --no-checkout mesa_test submit --empty shell: bash From 8e029b0957294674a19624fb83b1103076244ad9 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:37:21 -0400 Subject: [PATCH 31/55] test --- .github/workflows/test-mesa.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 3e5cea5a1..f6bc7d0bc 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -13,11 +13,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 - uses: ./.github/actions/install-mesa - with: - sdk: "23.7.3" - do_install: "false" # Skip install because mesa_test will do this + #- name: Install MESA on ${{ runner.os }} with SDK 23.7.3 + # uses: ./.github/actions/install-mesa + # with: + # sdk: "23.7.3" + # XXX do_install: "false" # Skip install because mesa_test will do this - name: Checkout mesa_test uses: actions/checkout@v4 From 612fea0b7d649d299c990a940b9e295efc7e899d Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:38:18 -0400 Subject: [PATCH 32/55] test --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index f6bc7d0bc..ccb6cc0ad 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -47,7 +47,7 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo "XXX" echo ${{secrets.MESA_TEST_EMAIL}} | sed 's/./& /g' # XXXmesa_test install --no-checkout From ed1a7c65a144f64ba2a379ae13a3194d0f0c515e Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:47:25 -0400 Subject: [PATCH 33/55] echo --- .github/workflows/test-mesa.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index ccb6cc0ad..71c89d200 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -38,17 +38,18 @@ jobs: mkdir /home/runner/.mesa_test MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML - echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: ${{secrets.MESA_TEST_EMAIL}}" | sed 's/./& /g' >> $MESA_TEST_YML - echo "password: ${{secrets.MESA_TEST_PASSWORD}}" | sed 's/./& /g' >> $MESA_TEST_YML - echo "logs_token: ${{secrets.MESA_TEST_LOGS_TOKEN}}" | sed 's/./& /g' >> $MESA_TEST_YML - echo "github_protocol: :ssh" >> $MESA_TEST_YML - echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML - echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML - echo "platform: Linux" >> $MESA_TEST_YML - echo "platform_version: Ubuntu" >> $MESA_TEST_YML + echo "computer_name: GitHub_Runner" > $MESA_TEST_YML + echo "email: ${{ secrets.MESA_TEST_EMAIL }}" > $MESA_TEST_YML + echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" > $MESA_TEST_YML + echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" > $MESA_TEST_YML + echo "github_protocol: :ssh" > $MESA_TEST_YML + echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" > $MESA_TEST_YML + echo "mesa_work: $GITHUB_WORKSPACE" > $MESA_TEST_YML + echo "platform: Linux" > $MESA_TEST_YML + echo "platform_version: Ubuntu" > $MESA_TEST_YML # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo "XXX" + more $MESA_TEST_YML echo ${{secrets.MESA_TEST_EMAIL}} | sed 's/./& /g' # XXXmesa_test install --no-checkout mesa_test submit --empty From 6b755d4a9a18afea9bc1531801a3b4c58ef3aaa2 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:51:28 -0400 Subject: [PATCH 34/55] echo --- .github/workflows/test-mesa.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 71c89d200..241e98ff3 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -38,15 +38,15 @@ jobs: mkdir /home/runner/.mesa_test MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML - echo "computer_name: GitHub_Runner" > $MESA_TEST_YML - echo "email: ${{ secrets.MESA_TEST_EMAIL }}" > $MESA_TEST_YML - echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" > $MESA_TEST_YML - echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" > $MESA_TEST_YML - echo "github_protocol: :ssh" > $MESA_TEST_YML - echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" > $MESA_TEST_YML - echo "mesa_work: $GITHUB_WORKSPACE" > $MESA_TEST_YML - echo "platform: Linux" > $MESA_TEST_YML - echo "platform_version: Ubuntu" > $MESA_TEST_YML + echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML + echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML + echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML + echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML + echo "github_protocol: :ssh" >> $MESA_TEST_YML + echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML + echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML + echo "platform: Linux" >> $MESA_TEST_YML + echo "platform_version: Ubuntu" >> $MESA_TEST_YML # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo "XXX" more $MESA_TEST_YML From 497b89e06af383475c79ce29fa5501c2d4dede1f Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 21:54:32 -0400 Subject: [PATCH 35/55] echo --- .github/workflows/test-mesa.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 241e98ff3..2eef7fd9a 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -26,6 +26,10 @@ jobs: path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - name: Install mesa_test and create config file + env: + MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} + MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} run: | # Setup mesa_test cd $GITHUB_WORKSPACE/mesa_test @@ -39,9 +43,9 @@ jobs: MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML - echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML - echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML + echo "email: $MESA_TEST_EMAIL" >> $MESA_TEST_YML + echo "password: $MESA_TEST_PASSWORD" >> $MESA_TEST_YML + echo "logs_token: $MESA_TEST_LOGS_TOKEN" >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML @@ -50,7 +54,7 @@ jobs: # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo "XXX" more $MESA_TEST_YML - echo ${{secrets.MESA_TEST_EMAIL}} | sed 's/./& /g' + echo $MESA_TEST_EMAIL | sed 's/./& /g' # XXXmesa_test install --no-checkout mesa_test submit --empty shell: bash From 43af9df5fe8deef2b7a0ad775621c27ec7553a57 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 22:14:07 -0400 Subject: [PATCH 36/55] python --- .github/workflows/test-mesa.yml | 40 ++++++++++++--------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 2eef7fd9a..b7fcad211 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -25,42 +25,30 @@ jobs: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - - name: Install mesa_test and create config file - env: - MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} - MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} - MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} + - name: Install mesa_test run: | # Setup mesa_test cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE - export OMP_NUM_THREADS=${{env.OMP_NUM_THREADS}} - export NPROCS=${{env.NPROCS}} - export MESASDK_ROOT=${{env.MESASDK_ROOT}} - export MESA_DIR=${{env.MESA_DIR}} mkdir /home/runner/.mesa_test - MESA_TEST_YML=/home/runner/.mesa_test/config.yml - echo "---" > $MESA_TEST_YML - echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: $MESA_TEST_EMAIL" >> $MESA_TEST_YML - echo "password: $MESA_TEST_PASSWORD" >> $MESA_TEST_YML - echo "logs_token: $MESA_TEST_LOGS_TOKEN" >> $MESA_TEST_YML - echo "github_protocol: :ssh" >> $MESA_TEST_YML - echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML - echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML - echo "platform: Linux" >> $MESA_TEST_YML - echo "platform_version: Ubuntu" >> $MESA_TEST_YML - # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" - echo "XXX" - more $MESA_TEST_YML - echo $MESA_TEST_EMAIL | sed 's/./& /g' - # XXXmesa_test install --no-checkout - mesa_test submit --empty shell: bash + - name: Create mesa_test config file + env: + MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} + MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} + run: | + import os + lines = ['---', 'computer_name: GitHub_Runner', 'email: '+os.getenv("MESA_TEST_EMAIL"), 'password: '+os.getenv("MESA_TEST_PASSWORD"), 'logs_token: '+os.getenv("MESA_TEST_LOGS_TOKEN"), 'github_protocol: :ssh', 'mesa_mirror: '+os.getenv("GITHUB_WORKSPACE")+'/mirror', 'mesa_work: '+os.getenv("GITHUB_WORKSPACE"), 'platform: Linux', 'platform_version: Ubuntu'] + with open('/home/runner/.mesa_test/config.yml', 'a') as f: + f.writelines(lines) + shell: python + - name: Test Problem 13 run: | + mesa_test submit --empty # XXXmesa_test test 13 shell: bash From 32ead6eda3fcd407e9a82baafd650dfb583ff49c Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 22:15:57 -0400 Subject: [PATCH 37/55] temp disable --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 620d10d8b..3f55b7e2a 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,6 +1,6 @@ name: Build on Linux with SDK -on: [pull_request, release] +on: [release] jobs: build: From fab989bb186043ddc72e939077f11c1908722196 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 22:48:14 -0400 Subject: [PATCH 38/55] test --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index b7fcad211..4180ae9ac 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -43,7 +43,7 @@ jobs: import os lines = ['---', 'computer_name: GitHub_Runner', 'email: '+os.getenv("MESA_TEST_EMAIL"), 'password: '+os.getenv("MESA_TEST_PASSWORD"), 'logs_token: '+os.getenv("MESA_TEST_LOGS_TOKEN"), 'github_protocol: :ssh', 'mesa_mirror: '+os.getenv("GITHUB_WORKSPACE")+'/mirror', 'mesa_work: '+os.getenv("GITHUB_WORKSPACE"), 'platform: Linux', 'platform_version: Ubuntu'] with open('/home/runner/.mesa_test/config.yml', 'a') as f: - f.writelines(lines) + f.writelines([string + '\n' for string in lines]) shell: python - name: Test Problem 13 From 8b0370a0f477f4ca855b5a3fe961f68f0176d444 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 22:52:48 -0400 Subject: [PATCH 39/55] test --- .github/workflows/test-mesa.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 4180ae9ac..577c0dc56 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -34,6 +34,15 @@ jobs: mkdir /home/runner/.mesa_test shell: bash + - name: Set env as secret + env: + MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + run: | + import os + for q in (os.getenv("MESA_TEST_EMAIL")): + print(q) + shell: python + - name: Create mesa_test config file env: MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} From 222736f32080eb2414b10e39bccba8b875a4b73b Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 22:55:10 -0400 Subject: [PATCH 40/55] test --- .github/workflows/test-mesa.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 577c0dc56..885df815e 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -36,11 +36,13 @@ jobs: - name: Set env as secret env: - MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + XXX: ${{ secrets.MESA_TEST_EMAIL }} run: | import os - for q in (os.getenv("MESA_TEST_EMAIL")): + print('XXX') + for q in (os.getenv("XXX")): print(q) + print('DONE') shell: python - name: Create mesa_test config file From 8afb4d26cb5aa5ca82dd98fb5b6128364b2ce7c2 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 23:15:45 -0400 Subject: [PATCH 41/55] env --- .github/workflows/test-mesa.yml | 52 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 885df815e..ec0c37e19 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -4,6 +4,7 @@ on: [pull_request, release] jobs: test_mesa: + environment: gh-action-testhub strategy: fail-fast: false @@ -25,41 +26,42 @@ jobs: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - - name: Install mesa_test + - name: Install mesa_test and create config file + env: + MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} + MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} run: | # Setup mesa_test cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE + export OMP_NUM_THREADS=${{env.OMP_NUM_THREADS}} + export NPROCS=${{env.NPROCS}} + export MESASDK_ROOT=${{env.MESASDK_ROOT}} + export MESA_DIR=${{env.MESA_DIR}} mkdir /home/runner/.mesa_test + MESA_TEST_YML=/home/runner/.mesa_test/config.yml + echo "---" > $MESA_TEST_YML + echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML + echo "email: $MESA_TEST_EMAIL" >> $MESA_TEST_YML + echo "password: $MESA_TEST_PASSWORD" >> $MESA_TEST_YML + echo "logs_token: $MESA_TEST_LOGS_TOKEN" >> $MESA_TEST_YML + echo "github_protocol: :ssh" >> $MESA_TEST_YML + echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML + echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML + echo "platform: Linux" >> $MESA_TEST_YML + echo "platform_version: Ubuntu" >> $MESA_TEST_YML + # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" + echo "XXX" + more $MESA_TEST_YML + echo $MESA_TEST_EMAIL | sed 's/./& /g' + # XXXmesa_test install --no-checkout + mesa_test submit --empty shell: bash - - name: Set env as secret - env: - XXX: ${{ secrets.MESA_TEST_EMAIL }} - run: | - import os - print('XXX') - for q in (os.getenv("XXX")): - print(q) - print('DONE') - shell: python - - - name: Create mesa_test config file - env: - MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} - MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} - MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} - run: | - import os - lines = ['---', 'computer_name: GitHub_Runner', 'email: '+os.getenv("MESA_TEST_EMAIL"), 'password: '+os.getenv("MESA_TEST_PASSWORD"), 'logs_token: '+os.getenv("MESA_TEST_LOGS_TOKEN"), 'github_protocol: :ssh', 'mesa_mirror: '+os.getenv("GITHUB_WORKSPACE")+'/mirror', 'mesa_work: '+os.getenv("GITHUB_WORKSPACE"), 'platform: Linux', 'platform_version: Ubuntu'] - with open('/home/runner/.mesa_test/config.yml', 'a') as f: - f.writelines([string + '\n' for string in lines]) - shell: python - - name: Test Problem 13 run: | - mesa_test submit --empty # XXXmesa_test test 13 shell: bash From 73d1a984b3676246435a829168ab01be35439ebb Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 23:21:13 -0400 Subject: [PATCH 42/55] test --- .github/workflows/test-mesa.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index ec0c37e19..db89ae2a6 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -14,10 +14,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - #- name: Install MESA on ${{ runner.os }} with SDK 23.7.3 - # uses: ./.github/actions/install-mesa - # with: - # sdk: "23.7.3" + - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 + uses: ./.github/actions/install-mesa + with: + sdk: "23.7.3" # XXX do_install: "false" # Skip install because mesa_test will do this - name: Checkout mesa_test @@ -52,17 +52,16 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - # XXXsource "${MESASDK_ROOT}/bin/mesasdk_init.sh" - echo "XXX" - more $MESA_TEST_YML + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo $MESA_TEST_EMAIL | sed 's/./& /g' # XXXmesa_test install --no-checkout mesa_test submit --empty + mesa_test test 15 shell: bash - name: Test Problem 13 run: | - # XXXmesa_test test 13 + mesa_test test 13 shell: bash #- name: Test Problem 15 From c298081d4591f8b8e11f609b341ee48430785918 Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 23:26:31 -0400 Subject: [PATCH 43/55] test2 --- .github/workflows/test-mesa.yml | 39 +++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index db89ae2a6..0db0aa55a 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -26,41 +26,52 @@ jobs: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - - name: Install mesa_test and create config file - env: - MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} - MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} - MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} - run: | + - name: Install mesa_test # Setup mesa_test cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE - export OMP_NUM_THREADS=${{env.OMP_NUM_THREADS}} - export NPROCS=${{env.NPROCS}} - export MESASDK_ROOT=${{env.MESASDK_ROOT}} - export MESA_DIR=${{env.MESA_DIR}} mkdir /home/runner/.mesa_test + shell: bash + + - name: Create mesa_test config file + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} + MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} + MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} + MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} + run: | MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML echo "computer_name: GitHub_Runner" >> $MESA_TEST_YML - echo "email: $MESA_TEST_EMAIL" >> $MESA_TEST_YML - echo "password: $MESA_TEST_PASSWORD" >> $MESA_TEST_YML - echo "logs_token: $MESA_TEST_LOGS_TOKEN" >> $MESA_TEST_YML + echo "email: ${{ secrets.MESA_TEST_EMAIL }}" >> $MESA_TEST_YML + echo "password: ${{ secrets.MESA_TEST_PASSWORD }}" >> $MESA_TEST_YML + echo "logs_token: ${{ secrets.MESA_TEST_LOGS_TOKEN }}" >> $MESA_TEST_YML echo "github_protocol: :ssh" >> $MESA_TEST_YML echo "mesa_mirror: $GITHUB_WORKSPACE/mirror" >> $MESA_TEST_YML echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML + echo "XXX" source "${MESASDK_ROOT}/bin/mesasdk_init.sh" echo $MESA_TEST_EMAIL | sed 's/./& /g' + echo ${{ secrets.MESA_TEST_EMAIL }} | sed 's/./& /g' # XXXmesa_test install --no-checkout mesa_test submit --empty - mesa_test test 15 + mesa_test test 29 shell: bash - name: Test Problem 13 + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} run: | + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" mesa_test test 13 shell: bash From 0843fc8189f714ac0f8c74860e59cc75f00aa62f Mon Sep 17 00:00:00 2001 From: pmocz Date: Thu, 18 Jul 2024 23:28:11 -0400 Subject: [PATCH 44/55] test2 --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 0db0aa55a..d38ed324b 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -27,7 +27,7 @@ jobs: path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - name: Install mesa_test - # Setup mesa_test + run: | cd $GITHUB_WORKSPACE/mesa_test sudo gem install mesa_test cd $GITHUB_WORKSPACE From 7b5820a40e2ab0306f2e18a01a33203253cccee9 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 07:20:25 -0400 Subject: [PATCH 45/55] try again --- .github/workflows/test-mesa.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index d38ed324b..508eb740c 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -18,7 +18,7 @@ jobs: uses: ./.github/actions/install-mesa with: sdk: "23.7.3" - # XXX do_install: "false" # Skip install because mesa_test will do this + do_install: "false" # Skip install because mesa_test will do this XXX remove - name: Checkout mesa_test uses: actions/checkout@v4 @@ -35,14 +35,6 @@ jobs: shell: bash - name: Create mesa_test config file - env: - OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} - NPROCS: ${{env.NPROCS}} - MESASDK_ROOT: ${{env.MESASDK_ROOT}} - MESA_DIR: ${{env.MESA_DIR}} - MESA_TEST_EMAIL: ${{ secrets.MESA_TEST_EMAIL }} - MESA_TEST_PASSWORD: ${{ secrets.MESA_TEST_PASSWORD }} - MESA_TEST_LOGS_TOKEN: ${{ secrets.MESA_TEST_LOGS_TOKEN }} run: | MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML @@ -55,13 +47,13 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML + mesa_test submit --empty echo "XXX" - source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - echo $MESA_TEST_EMAIL | sed 's/./& /g' - echo ${{ secrets.MESA_TEST_EMAIL }} | sed 's/./& /g' + # source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + # echo $MESA_TEST_EMAIL | sed 's/./& /g' + # echo ${{ secrets.MESA_TEST_EMAIL }} | sed 's/./& /g' # XXXmesa_test install --no-checkout - mesa_test submit --empty - mesa_test test 29 + #mesa_test test 29 shell: bash - name: Test Problem 13 From b4acc3491100c5758d3981df2968bc1356dc0759 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 07:31:14 -0400 Subject: [PATCH 46/55] enable --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 508eb740c..8772bd351 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -18,7 +18,6 @@ jobs: uses: ./.github/actions/install-mesa with: sdk: "23.7.3" - do_install: "false" # Skip install because mesa_test will do this XXX remove - name: Checkout mesa_test uses: actions/checkout@v4 @@ -47,6 +46,7 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML + echo "XXX" mesa_test submit --empty echo "XXX" # source "${MESASDK_ROOT}/bin/mesasdk_init.sh" From eec1abdfbc3a973a518f31db58659097cea89ddf Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 09:38:47 -0400 Subject: [PATCH 47/55] test --- .github/workflows/test-mesa.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 8772bd351..8f2df5e90 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -34,6 +34,11 @@ jobs: shell: bash - name: Create mesa_test config file + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} run: | MESA_TEST_YML=/home/runner/.mesa_test/config.yml echo "---" > $MESA_TEST_YML @@ -47,8 +52,11 @@ jobs: echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML echo "XXX" + source $MESASDK_ROOT/bin/mesasdk_init.sh mesa_test submit --empty echo "XXX" + mesa_test test 15 + echo "XXX" # source "${MESASDK_ROOT}/bin/mesasdk_init.sh" # echo $MESA_TEST_EMAIL | sed 's/./& /g' # echo ${{ secrets.MESA_TEST_EMAIL }} | sed 's/./& /g' From dbb7f77a64830b08db9acc1d6d24c27eaefa9433 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 10:57:09 -0400 Subject: [PATCH 48/55] print git hashes --- .github/workflows/test-mesa.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 8f2df5e90..24481b4c2 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -14,17 +14,35 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Print git hash + run: | + cd $GITHUB_WORKSPACE + git log --pretty=format:'%h' -n 1 + shell: bash + - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 uses: ./.github/actions/install-mesa with: sdk: "23.7.3" + - name: Print git hash + run: | + cd $GITHUB_WORKSPACE + git log --pretty=format:'%h' -n 1 + shell: bash + - name: Checkout mesa_test uses: actions/checkout@v4 with: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test + - name: Print git hash + run: | + cd $GITHUB_WORKSPACE + git log --pretty=format:'%h' -n 1 + shell: bash + - name: Install mesa_test run: | cd $GITHUB_WORKSPACE/mesa_test From 116c77315711fcad889492c5216d92a5f1741b86 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 11:11:36 -0400 Subject: [PATCH 49/55] more info --- .github/workflows/test-mesa.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 24481b4c2..158038558 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -16,8 +16,13 @@ jobs: - name: Print git hash run: | + pwd cd $GITHUB_WORKSPACE + pwd + git status + git branch git log --pretty=format:'%h' -n 1 + ls -la shell: bash - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 From 13eb682ef50c0fcb2a05487449b50063e1823780 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 11:23:37 -0400 Subject: [PATCH 50/55] try ref --- .github/workflows/test-mesa.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 158038558..c8e76d2f7 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -13,12 +13,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} - name: Print git hash run: | pwd cd $GITHUB_WORKSPACE pwd + echo $GITHUB_SHA git status git branch git log --pretty=format:'%h' -n 1 From a2de3358dae330addfbcd8a07b2f3d48c95163c1 Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 13:12:36 -0400 Subject: [PATCH 51/55] updating auto-tests --- .github/actions/install-mesa/action.yml | 12 ++--- .github/workflows/build-linux.yml | 2 +- .github/workflows/test-mesa.yml | 71 +++++++++++-------------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index e2d8425c3..9cb815a82 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -7,10 +7,6 @@ inputs: description: 'The version of the MESA SDK to install' required: false default: '23.7.3' - do_install: - description: 'Perform the final MESA installation after setting up SDK and environment' - required: false - default: 'true' runs: @@ -111,10 +107,8 @@ runs: # Turn off caching during build to save more space sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90 sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90 - if [ ${{inputs.do_install}} = "true" ]; then - ./install - if [ ! -f lib/libbinary.a ]; then - exit 1 - fi + ./install + if [ ! -f lib/libbinary.a ]; then + exit 1 fi shell: bash diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 3f55b7e2a..620d10d8b 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,6 +1,6 @@ name: Build on Linux with SDK -on: [release] +on: [pull_request, release] jobs: build: diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index c8e76d2f7..be5e8109a 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -18,14 +18,10 @@ jobs: - name: Print git hash run: | - pwd cd $GITHUB_WORKSPACE pwd - echo $GITHUB_SHA - git status git branch git log --pretty=format:'%h' -n 1 - ls -la shell: bash - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 @@ -33,24 +29,12 @@ jobs: with: sdk: "23.7.3" - - name: Print git hash - run: | - cd $GITHUB_WORKSPACE - git log --pretty=format:'%h' -n 1 - shell: bash - - name: Checkout mesa_test uses: actions/checkout@v4 with: repository: MESAHub/mesa_test path: mesa_test # Store in $GITHUB_WORKSPACE/mesa_test - - name: Print git hash - run: | - cd $GITHUB_WORKSPACE - git log --pretty=format:'%h' -n 1 - shell: bash - - name: Install mesa_test run: | cd $GITHUB_WORKSPACE/mesa_test @@ -77,17 +61,6 @@ jobs: echo "mesa_work: $GITHUB_WORKSPACE" >> $MESA_TEST_YML echo "platform: Linux" >> $MESA_TEST_YML echo "platform_version: Ubuntu" >> $MESA_TEST_YML - echo "XXX" - source $MESASDK_ROOT/bin/mesasdk_init.sh - mesa_test submit --empty - echo "XXX" - mesa_test test 15 - echo "XXX" - # source "${MESASDK_ROOT}/bin/mesasdk_init.sh" - # echo $MESA_TEST_EMAIL | sed 's/./& /g' - # echo ${{ secrets.MESA_TEST_EMAIL }} | sed 's/./& /g' - # XXXmesa_test install --no-checkout - #mesa_test test 29 shell: bash - name: Test Problem 13 @@ -101,17 +74,35 @@ jobs: mesa_test test 13 shell: bash - #- name: Test Problem 15 - # run: | - # mesa_test test 15 - # shell: bash - # - #- name: Test Problem 29 - # run: | - # mesa_test test 29 - # shell: bash + - name: Test Problem 15 + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} + run: | + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + mesa_test test 15 + shell: bash + + - name: Test Problem 29 + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} + run: | + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + mesa_test test 29 + shell: bash - #- name: Test Problem 41 - # run: | - # mesa_test test 41 - # shell: bash + - name: Test Problem 41 + env: + OMP_NUM_THREADS: ${{env.OMP_NUM_THREADS}} + NPROCS: ${{env.NPROCS}} + MESASDK_ROOT: ${{env.MESASDK_ROOT}} + MESA_DIR: ${{env.MESA_DIR}} + run: | + source "${MESASDK_ROOT}/bin/mesasdk_init.sh" + mesa_test test 41 + shell: bash From 74dee6d49badd8c203ece5a5e099d394280ae05c Mon Sep 17 00:00:00 2001 From: pmocz Date: Fri, 19 Jul 2024 13:14:56 -0400 Subject: [PATCH 52/55] removing automatic testing on every PR for now --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index be5e8109a..7978d1cdd 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -1,6 +1,6 @@ name: Test Mesa -on: [pull_request, release] +on: [release] jobs: test_mesa: From b53a3dbc945476ec80be506833a78d1f0d79cb4f Mon Sep 17 00:00:00 2001 From: pmocz Date: Wed, 21 Aug 2024 10:25:11 -0400 Subject: [PATCH 53/55] adding quick testing on PRs --- .github/workflows/test-mesa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index 7978d1cdd..be5e8109a 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -1,6 +1,6 @@ name: Test Mesa -on: [release] +on: [pull_request, release] jobs: test_mesa: From 2e0169d2cfa735693dd839f0699d562a767a1655 Mon Sep 17 00:00:00 2001 From: pmocz Date: Wed, 4 Sep 2024 14:04:15 -0400 Subject: [PATCH 54/55] add new SDK version --- .github/actions/install-mesa/action.yml | 6 ++++++ .github/workflows/build-linux.yml | 2 +- .github/workflows/test-mesa.yml | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 9cb815a82..52e9ae405 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -83,6 +83,12 @@ runs: wget -q https://zenodo.org/record/10624843/files/mesasdk-x86_64-linux-23.7.3.tar.gz shell: bash + - name: Get SDK ${{ runner.os }} '24.7.1' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '24.7.1') }} + run: | + wget -q http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-24.7.1.tar.gz + shell: bash + - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} run: | tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 620d10d8b..e76bb2e68 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["21.4.1", "22.6.1", "23.7.3"] + sdk: ["22.6.1", "23.7.3", "24.7.1"] runs-on: ubuntu-latest diff --git a/.github/workflows/test-mesa.yml b/.github/workflows/test-mesa.yml index be5e8109a..f5ed09c6d 100644 --- a/.github/workflows/test-mesa.yml +++ b/.github/workflows/test-mesa.yml @@ -1,6 +1,6 @@ name: Test Mesa -on: [pull_request, release] +on: [workflow_dispatch, release] jobs: test_mesa: @@ -24,10 +24,10 @@ jobs: git log --pretty=format:'%h' -n 1 shell: bash - - name: Install MESA on ${{ runner.os }} with SDK 23.7.3 + - name: Install MESA on ${{ runner.os }} with SDK 24.7.1 uses: ./.github/actions/install-mesa with: - sdk: "23.7.3" + sdk: "24.7.1" - name: Checkout mesa_test uses: actions/checkout@v4 From 4473d7b7ec464aed476919e9e10278efd98a83ea Mon Sep 17 00:00:00 2001 From: pmocz Date: Mon, 16 Sep 2024 12:00:57 -0400 Subject: [PATCH 55/55] adding sdk 24.7.1 url --- .github/actions/install-mesa/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 52e9ae405..77691ecdf 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -86,7 +86,7 @@ runs: - name: Get SDK ${{ runner.os }} '24.7.1' if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '24.7.1') }} run: | - wget -q http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-x86_64-linux-24.7.1.tar.gz + wget -q https://zenodo.org/records/13768913/files/mesasdk-x86_64-linux-24.7.1.tar.gz shell: bash - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}}