Skip to content

Commit

Permalink
add back in logic for branch identification
Browse files Browse the repository at this point in the history
  • Loading branch information
jperez999 committed Oct 12, 2023
1 parent 08e75ba commit b90d0d1
Showing 1 changed file with 44 additions and 4 deletions.
48 changes: 44 additions & 4 deletions .github/workflows/gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ jobs:
- name: Run tests
run: |
pip install tox
PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" tox -e gpu
ref_type=${{ github.ref_type }}
branch=main
if [[ $ref_type == "tag"* ]]
then
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
fi
if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then
extra_pytest_markers="and changed"
fi
PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu
gpu-ci-pytorch:
runs-on: linux-amd64-gpu-p100-latest-1

Check failure on line 40 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file

Check failure on line 40 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file
Expand All @@ -40,7 +50,17 @@ jobs:
- name: Run tests
run: |
pip install tox
PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" tox -e gpu
ref_type=${{ github.ref_type }}
branch=main
if [[ $ref_type == "tag"* ]]
then
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
fi
if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then
extra_pytest_markers="and changed"
fi
PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu
gpu-ci-tensorflow-examples:
runs-on: linux-amd64-gpu-p100-latest-1

Check failure on line 66 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file

Check failure on line 66 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file
Expand All @@ -56,7 +76,17 @@ jobs:
- name: Run tests
run: |
pip install tox
PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" tox -e gpu
ref_type=${{ github.ref_type }}
branch=main
if [[ $ref_type == "tag"* ]]
then
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
fi
if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then
extra_pytest_markers="and changed"
fi
PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu
gpu-ci-pytorch-examples:
runs-on: linux-amd64-gpu-p100-latest-1

Check failure on line 92 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file

Check failure on line 92 in .github/workflows/gpu.yml

View workflow job for this annotation

GitHub Actions / actionlint

label "linux-amd64-gpu-p100-latest-1" is unknown. available labels are "windows-latest", "windows-2022", "windows-2019", "windows-2016", "ubuntu-latest", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "macos-latest", "macos-12", "macos-12.0", "macos-11", "macos-11.0", "macos-10.15", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "1GPU", "2GPU". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file
Expand All @@ -72,4 +102,14 @@ jobs:
- name: Run tests
run: |
pip install tox
PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" tox -e gpu
ref_type=${{ github.ref_type }}
branch=main
if [[ $ref_type == "tag"* ]]
then
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
fi
if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then
extra_pytest_markers="and changed"
fi
PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu

0 comments on commit b90d0d1

Please sign in to comment.