From 351a4129778182465368c80ebeb57db0dd55b11e Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Wed, 28 Aug 2024 14:27:14 -0500 Subject: [PATCH] Workflow minor cleanups --- .github/workflows/build_and_test_develop.yml | 7 +++++-- .github/workflows/clang-format-check.yml | 3 --- .github/workflows/custom_check.yml | 9 +++------ .github/workflows/documentation.yml | 4 ++-- .github/workflows/windows_release.yml | 3 --- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_and_test_develop.yml b/.github/workflows/build_and_test_develop.yml index 840521bcb8f..67f5a4b801e 100644 --- a/.github/workflows/build_and_test_develop.yml +++ b/.github/workflows/build_and_test_develop.yml @@ -4,11 +4,14 @@ on: push: branches: [ develop ] # run this on all commits to the develop branch +defaults: + run: + shell: bash + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} FC: gfortran-13 Python_REQUIRED_VERSION: 3.12.3 # 3.12.2 not available on Ubuntu 24 GHA - shell: bash jobs: build_and_test: @@ -101,4 +104,4 @@ jobs: - name: Test working-directory: ./build - run: ctest -C Release -E Basement -j 3 + run: ctest -C Release -E Basement -j ${{ matrix.nproc }} diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 93cc23a3167..6ba288502a1 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -3,9 +3,6 @@ name: clang-format on: push: branches: [ develop ] - # Sequence of patterns matched against refs/tags - tags: - - '*' pull_request: branches: [ develop ] diff --git a/.github/workflows/custom_check.yml b/.github/workflows/custom_check.yml index 552496e0f1b..5f2ba9e9457 100644 --- a/.github/workflows/custom_check.yml +++ b/.github/workflows/custom_check.yml @@ -4,18 +4,15 @@ on: [push] jobs: test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Custom Check shell: bash diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 0bc7b56be03..8ba0d6d97d8 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -10,10 +10,10 @@ jobs: - name: Checkout EnergyPlus uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Set up LaTeX run: sudo apt update && sudo apt install -y texlive texlive-xetex texlive-science poppler-utils diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml index a11f2bb5ac2..da554523444 100644 --- a/.github/workflows/windows_release.yml +++ b/.github/workflows/windows_release.yml @@ -203,8 +203,5 @@ jobs: working-directory: package run: ls -# - name: Setup tmate session -# uses: mxschmitt/action-tmate@v3 - - name: Run Package Tests run: python checkout/scripts/package_tests/runner.py --verbose --msvc 2022 win64 package/