Skip to content

Commit 39daea3

Browse files
committed
Fix trigger and variables
1 parent 65002e4 commit 39daea3

File tree

4 files changed

+21
-66
lines changed

4 files changed

+21
-66
lines changed

.github/actions/linux/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ runs:
2020
run: |-
2121
~/miniconda3/bin/conda init bash
2222
~/miniconda3/bin/conda create -n hydra python=${{ inputs.py_version }} -yqc conda-forge
23-
shell: bash
23+
shell: bash

.github/actions/macos/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ runs:
2020
bash ./Miniconda3-py39_24.5.0-0-MacOSX-arm64.sh -b
2121
fi
2222
~/miniconda3/bin/conda init bash
23+
export PATH="$HOME/miniconda3/bin:$PATH"
2324
shell: bash
2425
- name: Preparing environment - Brew
2526
run: |-
@@ -40,4 +41,4 @@ runs:
4041
path: |-
4142
~/miniconda3
4243
~/Library/Caches/Homebrew
43-
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
44+
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"

.github/workflows/core_tests.yml

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
11
name: facebookresearch/hydra/core_tests
22
on:
3-
workflow_dispatch:
4-
inputs:
5-
plugin_test:
6-
required: true
7-
test_plugins:
8-
required: true
9-
cache_key_version:
10-
required: false
11-
default: v1
12-
env:
13-
AWS_ACCESS_KEY_ID: xxxxXT3Z
14-
AWS_DEFAULT_REGION: xxxxst-2
15-
AWS_SECRET_ACCESS_KEY: xxxxGsxB
16-
CIRCLECI_TOKEN: xxxxed79
17-
INSTANCE_ROLE_ARN: xxxxr-v1
3+
push:
184
jobs:
19-
trigger_plugin_pipelines:
20-
if: ${{ !(${{ inputs.plugin_test }}) }}
21-
runs-on: ubuntu-latest
22-
container:
23-
image: python:3.8
24-
steps:
25-
- uses: "./.github/actions/early_return_for_forked_pull_requests"
26-
- uses: actions/checkout@v4.1.0
27-
- name: Kick off Plugin tests
28-
run: |-
29-
python tools/ci/circleci_pipeline.py
30-
echo "Done kicking off plugin tests."
5+
# trigger_plugin_pipelines:
6+
# runs-on: ubuntu-latest
7+
# steps:
8+
# - uses: actions/checkout@v4.1.0
9+
# - uses: "./.github/actions/early_return_for_forked_pull_requests"
10+
# - name: Kick off Plugin tests
11+
# uses: "./.github/actions/macos"
3112
test_macos:
32-
if: ${{ !(${{ inputs.plugin_test }}) }}
3313
runs-on: macos-latest
3414
strategy:
3515
matrix:
@@ -42,7 +22,7 @@ jobs:
4222
- uses: actions/checkout@v4.1.0
4323
- uses: maxim-lobanov/setup-xcode@v1.6.0
4424
with:
45-
xcode-version: 13.4.1
25+
xcode-version: latest-stable
4626
- uses: "./.github/actions/macos"
4727
with:
4828
py_version: "${{ matrix.py_version }}"
@@ -58,10 +38,7 @@ jobs:
5838
nox -s lint test_tools test_core test_jupyter_notebooks -ts
5939
fi
6040
test_linux:
61-
if: ${{ !(${{ inputs.plugin_test }}) }}
6241
runs-on: ubuntu-latest
63-
container:
64-
image: ubuntu
6542
strategy:
6643
matrix:
6744
py_version:
@@ -86,8 +63,7 @@ jobs:
8663
nox -s lint test_tools test_core test_jupyter_notebooks -ts
8764
fi
8865
test_win:
89-
if: ${{ !(${{ inputs.plugin_test }}) }}
90-
runs-on: ubuntu-latest
66+
runs-on: windows-latest
9167
strategy:
9268
matrix:
9369
py_version:
@@ -96,25 +72,20 @@ jobs:
9672
- '3.10'
9773
- '3.11'
9874
steps:
99-
# # This item has no matching transformer
100-
# - circleci_windows_:
10175
- name: Testing Hydra
10276
run: |-
103-
$env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
104-
$env:ConEmuDefaultCp=65001
105-
$env:PYTHONIOENCODING="utf_8"
77+
set NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
78+
set ConEmuDefaultCp=65001
79+
set PYTHONIOENCODING="utf_8"
10680
conda activate hydra
107-
If ($env:${{ github.event.number }}) {
81+
If ("${{ github.event.number }}") {
10882
nox -s lint test_tools test_core test_jupyter_notebooks lint_plugins test_plugins test_plugins_vs_core -ts
10983
} else {
11084
nox -s lint test_tools test_core test_jupyter_notebooks -ts
11185
}
11286
exit $LASTEXITCODE
11387
test_linux_omc_dev:
114-
if: ${{ !(${{ inputs.plugin_test }}) }}
11588
runs-on: ubuntu-latest
116-
container:
117-
image: ubuntu
11889
strategy:
11990
matrix:
12091
py_version:

.github/workflows/plugin_tests.yml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
name: facebookresearch/hydra/plugin_tests
22
on:
3-
workflow_dispatch:
3+
push:
44
inputs:
5-
plugin_test:
6-
required: true
75
test_plugins:
86
required: true
9-
cache_key_version:
10-
required: false
11-
default: v1
12-
env:
13-
AWS_ACCESS_KEY_ID: xxxxXT3Z
14-
AWS_DEFAULT_REGION: xxxxst-2
15-
AWS_SECRET_ACCESS_KEY: xxxxGsxB
16-
CIRCLECI_TOKEN: xxxxed79
17-
INSTANCE_ROLE_ARN: xxxxr-v1
7+
default: hydra_rq_launcher,hydra_ax_sweeper,hydra_submitit_launcher,hydra_nevergrad_sweeper
188
jobs:
199
test_plugin_linux:
20-
if: ${{ inputs.plugin_test }}
2110
runs-on: ubuntu-latest
22-
container:
23-
image: ubuntu
2411
strategy:
2512
matrix:
2613
py_version:
@@ -43,7 +30,6 @@ jobs:
4330
pip install nox dataclasses --progress-bar off
4431
nox -s lint_plugins test_plugins test_plugins_vs_core -ts
4532
test_plugin_macos:
46-
if: ${{ inputs.plugin_test }}
4733
runs-on: macos-latest
4834
strategy:
4935
matrix:
@@ -58,7 +44,7 @@ jobs:
5844
- uses: actions/checkout@v4.1.0
5945
- uses: maxim-lobanov/setup-xcode@v1.6.0
6046
with:
61-
xcode-version: 13.4.1
47+
xcode-version: latest-stable
6248
- uses: "./.github/actions/macos"
6349
with:
6450
py_version: "${{ matrix.py_version }}"
@@ -70,8 +56,7 @@ jobs:
7056
pip install nox dataclasses --progress-bar off
7157
nox -s lint_plugins test_plugins test_plugins_vs_core -ts
7258
test_plugin_win:
73-
if: ${{ inputs.plugin_test }}
74-
runs-on: ubuntu-latest
59+
runs-on: windows-latest
7560
strategy:
7661
matrix:
7762
py_version:
@@ -82,8 +67,6 @@ jobs:
8267
test_plugin:
8368
- "${{ inputs.test_plugins }}"
8469
steps:
85-
# # This item has no matching transformer
86-
# - circleci_windows_:
8770
- name: "${{ matrix.test_plugin }}"
8871
run: |-
8972
$env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"

0 commit comments

Comments
 (0)