Fix trigger and variables

facebookresearch · Oct 22, 2024 · 2fab46b · 2fab46b
1 parent 65002e4
commit 2fab46b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 53 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/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -1,35 +1,17 @@
 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
+    - uses: "./.github/actions/early_return_for_forked_pull_requests"
     - name: Kick off Plugin tests
       run: |-
         python tools/ci/circleci_pipeline.py
         echo "Done kicking off plugin tests."
   test_macos:
-    if: ${{ !(${{ inputs.plugin_test }}) }}
     runs-on: macos-latest
     strategy:
       matrix:
@@ -42,10 +24,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 }}"
+    - uses: conda-incubator/setup-miniconda@v3
+      with:
+        python-version: "${{ matrix.py_version }}"
     - name: Testing Hydra
       run: |-
         export NOX_PYTHON_VERSIONS=${{ matrix.py_version }}
@@ -58,10 +43,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 +68,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,8 +77,6 @@ jobs:
         - '3.10'
         - '3.11'
     steps:
-#     # This item has no matching transformer
-#     - circleci_windows_:
     - name: Testing Hydra
       run: |-
         $env:NOX_PYTHON_VERSIONS="${{ matrix.py_version }}"
@@ -111,10 +90,7 @@ jobs:
         }
         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 }}"