Skip to content

update gh workflows to fix merge queue #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adam-a-a wants to merge 6 commits into
base: main
Choose a base branch
from
Open

update gh workflows to fix merge queue #1843

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23a325b
update gh workflows to fix merge queue
adam-a-a Jun 30, 2026
2f3f95a
add checkout step
adam-a-a Jun 30, 2026
d99148c
update install urls
adam-a-a Jun 30, 2026
e0b556b
comment out install url steps
adam-a-a Jun 30, 2026
9a07898
bring back install url steps
adam-a-a Jun 30, 2026
df62018
Apply suggestions from code review
adam-a-a Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ concurrency:
# github.head_ref is only defined for pull request events
# so, if it's not present (i.e. event was triggered by push)
# we use github.ref instead
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
# Isolates concurrency keys for pull requests, merge queues, and trunk branch pushes
group: >-
${{ github.workflow }}-${{
github.event.pull_request.number ||
github.event.merge_group.head_ref ||
github.ref
}}
cancel-in-progress: true

defaults:
Expand Down Expand Up @@ -213,6 +219,11 @@ jobs:
- os: win64
os-version: windows-2022
steps:
- name: Checkout repository code
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: conda-incubator/setup-miniconda@v4
with:
Expand All @@ -222,24 +233,31 @@ jobs:
conda-remove-defaults: 'true'
auto-activate: false

- name: Define install URL (default)
- name: Define install URL (for Main Branch)
if: format('refs/heads/{0}', github.event.repository.default_branch) == github.ref && !github.event.pull_request && !github.event.merge_group
env:
_repo_full_name: watertap-org/watertap
_ref_to_install: main
run: |
echo "_install_url=https://github.com/${_repo_full_name}/archive/${_ref_to_install}.zip" >> $GITHUB_ENV
- name: Define install URL (for PRs)
if: github.event.pull_request
_install_url="https://github.com{_repo_full_name}/archive/${_ref_to_install}.zip"
Comment thread
adam-a-a marked this conversation as resolved.
Outdated
echo "_install_url=${_install_url}" >> $GITHUB_ENV
echo "Install URL: ${_install_url}"

- name: Define install URL (for PRs and Merge Groups)
if: github.event.pull_request || github.event.merge_group
env:
_repo_full_name: ${{ github.event.pull_request.head.repo.full_name }}
_ref_to_install: ${{ github.event.pull_request.head.sha }}
_repo_full_name: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
_ref_to_install: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
run: |
echo "_install_url=https://github.com/${_repo_full_name}/archive/${_ref_to_install}.zip" >> $GITHUB_ENV
_install_url="https://github.com{_repo_full_name}/archive/${_ref_to_install}.zip"
Comment thread
adam-a-a marked this conversation as resolved.
Outdated
echo "_install_url=${_install_url}" >> $GITHUB_ENV
echo "Install URL: ${_install_url}"

- name: Bootstrap packaging tools and verify installation
run: |
conda install --quiet --yes pip setuptools wheel
python -m pip show setuptools wheel
pip install -e .
- name: Install watertap and testing dependencies
run: |
echo '::group::Output of "pip install" commands'
Expand Down
Loading