Skip to content

Commit bdbf306

Browse files
jesszzzzjesszzzz
committed
Fix trigger and variables
1 parent 65002e4 commit bdbf306

File tree

4 files changed

+29
-67
lines changed

4 files changed

+29
-67
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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ runs:
1010
uses: actions/cache@v3.3.2
1111
with:
1212
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
13-
path: UPDATE_ME
13+
path: |-
14+
~/miniconda3
15+
~/Library/Caches/Homebrew
1416
- name: Preparing environment - Conda
1517
run: |-
1618
if [[ -f ~/miniconda3/LICENSE.txt ]] ; then
@@ -31,6 +33,8 @@ runs:
3133
shell: bash
3234
- name: Preparing environment - Hydra
3335
run: |-
36+
source $HOME/.bash_profile
37+
echo $PATH
3438
conda create -n hydra python=${{ inputs.py_version }} -yqc conda-forge
3539
conda run -n hydra pip install nox --progress-bar off
3640
shell: bash
@@ -40,4 +44,4 @@ runs:
4044
path: |-
4145
~/miniconda3
4246
~/Library/Caches/Homebrew
43-
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"
47+
key: "-${{ inputs.cache_key_version }}-macos-sys-{{ .Branch }}-${{ inputs.py_version }}"

‎.github/workflows/core_tests.yml‎

Lines changed: 18 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,12 +22,13 @@ 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 }}"
4929
- name: Testing Hydra
5030
run: |-
31+
source $HOME/.bash_profile
5132
export NOX_PYTHON_VERSIONS=${{ matrix.py_version }}
5233
conda activate hydra
5334
pip install nox dataclasses --progress-bar off
@@ -58,10 +39,7 @@ jobs:
5839
nox -s lint test_tools test_core test_jupyter_notebooks -ts
5940
fi
6041
test_linux:
61-
if: ${{ !(${{ inputs.plugin_test }}) }}
6242
runs-on: ubuntu-latest
63-
container:
64-
image: ubuntu
6543
strategy:
6644
matrix:
6745
py_version:
@@ -86,8 +64,7 @@ jobs:
8664
nox -s lint test_tools test_core test_jupyter_notebooks -ts
8765
fi
8866
test_win:
89-
if: ${{ !(${{ inputs.plugin_test }}) }}
90-
runs-on: ubuntu-latest
67+
runs-on: windows-latest
9168
strategy:
9269
matrix:
9370
py_version:
@@ -96,25 +73,23 @@ jobs:
9673
- '3.10'
9774
- '3.11'
9875
steps:
99-
# # This item has no matching transformer
100-
# - circleci_windows_:
10176
- name: Testing Hydra
10277
run: |-
103-
$env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
104-
$env:ConEmuDefaultCp=65001
105-
$env:PYTHONIOENCODING="utf_8"
78+
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -o miniconda.exe
79+
Start-Process -FilePath ".\miniconda.exe" -ArgumentList "/S" -Wait
80+
del miniconda.exe
81+
set NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
82+
set ConEmuDefaultCp=65001
83+
set PYTHONIOENCODING="utf_8"
10684
conda activate hydra
107-
If ($env:${{ github.event.number }}) {
85+
If ("${{ github.event.number }}") {
10886
nox -s lint test_tools test_core test_jupyter_notebooks lint_plugins test_plugins test_plugins_vs_core -ts
10987
} else {
11088
nox -s lint test_tools test_core test_jupyter_notebooks -ts
11189
}
11290
exit $LASTEXITCODE
11391
test_linux_omc_dev:
114-
if: ${{ !(${{ inputs.plugin_test }}) }}
11592
runs-on: ubuntu-latest
116-
container:
117-
image: ubuntu
11893
strategy:
11994
matrix:
12095
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)