Fix trigger and variables

facebookresearch · Oct 23, 2024 · a4987a0 · a4987a0
1 parent 65002e4
commit a4987a0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 68 deletions.
diff --git a/.github/actions/linux/action.yml b/.github/actions/linux/action.yml
@@ -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
diff --git a/.github/actions/macos/action.yml b/.github/actions/macos/action.yml
@@ -10,7 +10,9 @@ runs:
     uses: actions/cache@v3.3.2
     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
@@ -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
@@ -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 }}"
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -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/checkout@v4.1.0
-    - 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/checkout@v4.1.0
+  #   - 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:
@@ -42,12 +22,13 @@ jobs:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       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
@@ -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:
@@ -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:
@@ -96,25 +73,26 @@ jobs:
         - '3.10'
         - '3.11'
     steps:
-#     # This item has no matching transformer
-#     - circleci_windows_:
+    - uses: actions/checkout@v4.1.0
+    - 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"
+        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:

diff --git a/.github/workflows/plugin_tests.yml b/.github/workflows/plugin_tests.yml
@@ -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:
@@ -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:
@@ -58,7 +44,7 @@ jobs:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 13.4.1
+        xcode-version: latest-stable
     - uses: "./.github/actions/macos"
       with:
         py_version: "${{ matrix.py_version }}"
@@ -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:
@@ -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 }}"