Skip to content

Commit

Permalink
Fix trigger and variables
Browse files Browse the repository at this point in the history
  • Loading branch information
jesszzzz committed Oct 23, 2024
1 parent 65002e4 commit d4a8fc7
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/actions/linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ runs:
run: |-
~/miniconda3/bin/conda init bash
~/miniconda3/bin/conda create -n hydra python=${{ inputs.py_version }} -yqc conda-forge
shell: bash
shell: bash
8 changes: 6 additions & 2 deletions .github/actions/macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ runs:
uses: actions/[email protected]
with:
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
path: UPDATE_ME
path: |-
~/miniconda3
~/Library/Caches/Homebrew
- name: Preparing environment - Conda
run: |-
if [[ -f ~/miniconda3/LICENSE.txt ]] ; then
Expand All @@ -31,6 +33,8 @@ runs:
shell: bash
- name: Preparing environment - Hydra
run: |-
source $HOME/.bash_profile
echo $PATH
conda create -n hydra python=${{ inputs.py_version }} -yqc conda-forge
conda run -n hydra pip install nox --progress-bar off
shell: bash
Expand All @@ -40,4 +44,4 @@ runs:
path: |-
~/miniconda3
~/Library/Caches/Homebrew
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
66 changes: 22 additions & 44 deletions .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,15 @@
name: facebookresearch/hydra/core_tests
on:
workflow_dispatch:
inputs:
plugin_test:
required: true
test_plugins:
required: true
cache_key_version:
required: false
default: v1
env:
AWS_ACCESS_KEY_ID: xxxxXT3Z
AWS_DEFAULT_REGION: xxxxst-2
AWS_SECRET_ACCESS_KEY: xxxxGsxB
CIRCLECI_TOKEN: xxxxed79
INSTANCE_ROLE_ARN: xxxxr-v1
push:
jobs:
trigger_plugin_pipelines:
if: ${{ !(${{ inputs.plugin_test }}) }}
runs-on: ubuntu-latest
container:
image: python:3.8
steps:
- uses: "./.github/actions/early_return_for_forked_pull_requests"
- uses: actions/[email protected]
- name: Kick off Plugin tests
run: |-
python tools/ci/circleci_pipeline.py
echo "Done kicking off plugin tests."
# trigger_plugin_pipelines:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/[email protected]
# - uses: "./.github/actions/early_return_for_forked_pull_requests"
# - name: Kick off Plugin tests
# uses: "./.github/actions/macos"
test_macos:
if: ${{ !(${{ inputs.plugin_test }}) }}
runs-on: macos-latest
strategy:
matrix:
Expand All @@ -42,12 +22,13 @@ jobs:
- uses: actions/[email protected]
- uses: maxim-lobanov/[email protected]
with:
xcode-version: 13.4.1
xcode-version: latest-stable
- uses: "./.github/actions/macos"
with:
py_version: "${{ matrix.py_version }}"
- name: Testing Hydra
run: |-
source $HOME/.bash_profile
export NOX_PYTHON_VERSIONS=${{ matrix.py_version }}
conda activate hydra
pip install nox dataclasses --progress-bar off
Expand All @@ -58,10 +39,7 @@ jobs:
nox -s lint test_tools test_core test_jupyter_notebooks -ts
fi
test_linux:
if: ${{ !(${{ inputs.plugin_test }}) }}
runs-on: ubuntu-latest
container:
image: ubuntu
strategy:
matrix:
py_version:
Expand All @@ -86,8 +64,7 @@ jobs:
nox -s lint test_tools test_core test_jupyter_notebooks -ts
fi
test_win:
if: ${{ !(${{ inputs.plugin_test }}) }}
runs-on: ubuntu-latest
runs-on: windows-latest
strategy:
matrix:
py_version:
Expand All @@ -96,25 +73,26 @@ jobs:
- '3.10'
- '3.11'
steps:
# # This item has no matching transformer
# - circleci_windows_:
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
python-version: ${{ matrix.py-version }}
activate-environment: hydra
- name: Testing Hydra
run: |-
$env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
$env:ConEmuDefaultCp=65001
$env:PYTHONIOENCODING="utf_8"
conda activate hydra
If ($env:${{ github.event.number }}) {
conda run -n hydra pip install nox --progress-bar off
set NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
set ConEmuDefaultCp=65001
set PYTHONIOENCODING="utf_8"
ls
If ("${{ github.event.number }}") {
nox -s lint test_tools test_core test_jupyter_notebooks lint_plugins test_plugins test_plugins_vs_core -ts
} else {
nox -s lint test_tools test_core test_jupyter_notebooks -ts
}
exit $LASTEXITCODE
test_linux_omc_dev:
if: ${{ !(${{ inputs.plugin_test }}) }}
runs-on: ubuntu-latest
container:
image: ubuntu
strategy:
matrix:
py_version:
Expand Down
25 changes: 4 additions & 21 deletions .github/workflows/plugin_tests.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
name: facebookresearch/hydra/plugin_tests
on:
workflow_dispatch:
push:
inputs:
plugin_test:
required: true
test_plugins:
required: true
cache_key_version:
required: false
default: v1
env:
AWS_ACCESS_KEY_ID: xxxxXT3Z
AWS_DEFAULT_REGION: xxxxst-2
AWS_SECRET_ACCESS_KEY: xxxxGsxB
CIRCLECI_TOKEN: xxxxed79
INSTANCE_ROLE_ARN: xxxxr-v1
default: hydra_rq_launcher,hydra_ax_sweeper,hydra_submitit_launcher,hydra_nevergrad_sweeper
jobs:
test_plugin_linux:
if: ${{ inputs.plugin_test }}
runs-on: ubuntu-latest
container:
image: ubuntu
strategy:
matrix:
py_version:
Expand All @@ -43,7 +30,6 @@ jobs:
pip install nox dataclasses --progress-bar off
nox -s lint_plugins test_plugins test_plugins_vs_core -ts
test_plugin_macos:
if: ${{ inputs.plugin_test }}
runs-on: macos-latest
strategy:
matrix:
Expand All @@ -58,7 +44,7 @@ jobs:
- uses: actions/[email protected]
- uses: maxim-lobanov/[email protected]
with:
xcode-version: 13.4.1
xcode-version: latest-stable
- uses: "./.github/actions/macos"
with:
py_version: "${{ matrix.py_version }}"
Expand All @@ -70,8 +56,7 @@ jobs:
pip install nox dataclasses --progress-bar off
nox -s lint_plugins test_plugins test_plugins_vs_core -ts
test_plugin_win:
if: ${{ inputs.plugin_test }}
runs-on: ubuntu-latest
runs-on: windows-latest
strategy:
matrix:
py_version:
Expand All @@ -82,8 +67,6 @@ jobs:
test_plugin:
- "${{ inputs.test_plugins }}"
steps:
# # This item has no matching transformer
# - circleci_windows_:
- name: "${{ matrix.test_plugin }}"
run: |-
$env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
Expand Down

0 comments on commit d4a8fc7

Please sign in to comment.