Fixed gha for move back to public repo. (#5838)

miguelalonsojr · web-flow · commit 6bb711f1b0a2 · 2022-12-05T11:49:42.000-05:00
diff --git a/.github/workflows/colab.yml b/.github/workflows/colab.yml
@@ -8,17 +8,15 @@ on:
     - 'colab/**'
     - '.github/workflows/colab.yml'
   push:
-    branches: 
+    branches:
      - main
      - develop
      - 'release/**'
   workflow_dispatch:
 
 jobs:
   colab:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     env:
         COLAB_ALWAYS_INSTALL_XVFB: 1
         QLEARNING_NUM_TRAINING_STEPS: 5
@@ -37,18 +35,16 @@ jobs:
     - uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
-# Caching not supported on GitHub Enterprise
-# See https://github.com/actions/cache/issues/505
-#    - name: Cache pip
-#      uses: actions/cache@v2
-#      with:
-#        # This path is specific to Ubuntu
-#        path: ~/.cache/pip
-#        # Look to see if there is a cache hit for the corresponding requirements file
-#        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'gym-unity/setup.py', 'colab_requirements.txt') }}
-#        restore-keys: |
-#          ${{ runner.os }}-pip-
-#          ${{ runner.os }}-
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        # This path is specific to Ubuntu
+        path: ~/.cache/pip
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'gym-unity/setup.py', 'colab_requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+          ${{ runner.os }}-
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -10,8 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v2
-        # Only lock threads on public GitHub mirror, not enterprise.
-        if: ${{ github.server_url == 'https://github.com' }}
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: '30'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,9 +7,7 @@ on:
 
 jobs:
   markdown-link-check-full:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
@@ -28,8 +26,7 @@ jobs:
       run: |
         pre-commit run --hook-stage manual markdown-link-check-full --all-files
   full-pytest:
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [ self-hosted, Linux, X64 ]
+    runs-on: ubuntu-latest
 #   TODO: Re-use pytest workflow once https://github.com/github/roadmap/issues/257 is done.
 #    steps:
 #    - uses: actions/checkout@v2
@@ -57,18 +54,16 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-# Caching not supported on GitHub Enterprise
-# See https://github.com/actions/cache/issues/505
-#    - name: Cache pip
-#      uses: actions/cache@v2
-#      with:
-#        # This path is specific to Ubuntu
-#        path: ~/.cache/pip
-#        # Look to see if there is a cache hit for the corresponding requirements file
-#        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'test_requirements.txt', matrix.pip_constraints) }}
-#        restore-keys: |
-#          ${{ runner.os }}-pip-
-#          ${{ runner.os }}-
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        # This path is specific to Ubuntu
+        path: ~/.cache/pip
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'test_requirements.txt', matrix.pip_constraints) }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+          ${{ runner.os }}-
     - name: Display Python version
       run: python -c "import sys; print(sys.version)"
     - name: Install dependencies
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -11,13 +11,9 @@ on:
 
 jobs:
   pre-commit:
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-      with:
-        token: ${{ secrets.GHE_ACCESS_TOKEN }}
-        submodules: recursive
     - uses: actions/setup-python@v2
       with:
         python-version: 3.8.x
@@ -26,10 +22,9 @@ jobs:
         ImageOS: ubuntu20
       with:
         ruby-version: '2.6'
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.100'
-        include-prerelease: true
+        dotnet-version: '7.0.100'
     - name: Install manual dependencies
       run: |
         python -m pip install pre-commit
@@ -38,14 +33,9 @@ jobs:
       run: |
         pre-commit run --all-files
   markdown-link-check:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-          token: ${{ secrets.GHE_ACCESS_TOKEN }}
-          submodules: recursive
     - uses: actions/setup-python@v2
     - uses: actions/setup-node@v2
       with:
@@ -60,13 +50,8 @@ jobs:
       run: |
         pre-commit run --hook-stage manual markdown-link-check --all-files
   validate-meta-files:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-          token: ${{ secrets.GHE_ACCESS_TOKEN }}
-          submodules: recursive
     - uses: actions/setup-python@v2
     - run: python utils/validate_meta_files.py
diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml
@@ -6,7 +6,7 @@ on:
 jobs:
   publish:
     name: Publish Docs to GH Pages
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/publish_pypi.yaml b/.github/workflows/publish_pypi.yaml
@@ -10,10 +10,8 @@ on:
 
 jobs:
   build-and-publish:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
     name: publish to PyPI (or TestPyPI)
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     strategy:
         matrix:
             package-path: [ml-agents, ml-agents-envs]
diff --git a/.github/workflows/publish_pypi_python_api.yaml b/.github/workflows/publish_pypi_python_api.yaml
@@ -10,10 +10,8 @@ on:
 
 jobs:
   build-and-publish:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
     name: publish to PyPI (or TestPyPI)
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     strategy:
         matrix:
             package-path: [ml-agents-envs]
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -30,9 +30,7 @@ on:
 
 jobs:
   pytest:
-    # Only run on GitHub Enterprise
-    if: ${{ github.server_url == 'https://github.cds.internal.unity3d.com' }}
-    runs-on: [self-hosted, Linux, X64]
+    runs-on: ubuntu-latest
     env:
         TEST_ENFORCE_BUFFER_KEY_TYPES: 1
     strategy:
@@ -53,18 +51,16 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-# Caching not supported on GitHub Enterprise
-# See https://github.com/actions/cache/issues/505
-#    - name: Cache pip
-#      uses: actions/cache@v2
-#      with:
-#        # This path is specific to Ubuntu
-#        path: ~/.cache/pip
-#        # Look to see if there is a cache hit for the corresponding requirements file
-#        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'test_requirements.txt', matrix.pip_constraints) }}
-#        restore-keys: |
-#          ${{ runner.os }}-pip-
-#          ${{ runner.os }}-
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        # This path is specific to Ubuntu
+        path: ~/.cache/pip
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-pip-${{ hashFiles('ml-agents/setup.py', 'ml-agents-envs/setup.py', 'test_requirements.txt', matrix.pip_constraints) }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+          ${{ runner.os }}-
     - name: Display Python version
       run: python -c "import sys; print(sys.version)"
     - name: Install dependencies
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
             )$
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.931
+    rev: v0.991
     hooks:
     -   id: mypy
         name: mypy-ml-agents
@@ -81,16 +81,21 @@ repos:
     types: [markdown]
     exclude: ".*localized.*"
 
-- repo: https://github.com/dotnet/format
-  rev: v5.1.225507
-  hooks:
-  - id: dotnet-format
-    entry: dotnet-format whitespace
-    args: [--folder, --include]
+#- repo: https://github.com/dotnet/format
+#  rev: v5.1.225507
+#  hooks:
+#  - id: dotnet-format
+#    entry: dotnet-format whitespace
+#    args: [--folder, --include]
 
 # "Local" hooks, see https://pre-commit.com/#repository-local-hooks
 -   repo: local
     hooks:
+    -   id: dotnet-format
+        name: dotnet-format
+        language: system
+        entry: dotnet format whitespace --folder --include
+        types_or: ["c#"]
     -   id: markdown-link-check
         name: markdown-link-check
         entry: utils/run_markdown_link_check.py
diff --git a/Project/Assets/ML-Agents/Examples/Crawler/Scripts/CrawlerAgent.cs b/Project/Assets/ML-Agents/Examples/Crawler/Scripts/CrawlerAgent.cs
@@ -38,7 +38,7 @@ public float TargetWalkingSpeed
     public Transform TargetPrefab; //Target prefab to use in Dynamic envs
     private Transform m_Target; //Target the agent will walk towards during training.
 
-    [Header("Body Parts")] [Space(10)] public Transform body;
+    [Header("Body Parts")][Space(10)] public Transform body;
     public Transform leg0Upper;
     public Transform leg0Lower;
     public Transform leg1Upper;
diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/JointDriveController.cs b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/JointDriveController.cs
@@ -11,7 +11,7 @@ namespace Unity.MLAgentsExamples
     [System.Serializable]
     public class BodyPart
     {
-        [Header("Body Part Info")] [Space(10)] public ConfigurableJoint joint;
+        [Header("Body Part Info")][Space(10)] public ConfigurableJoint joint;
         public Rigidbody rb;
         [HideInInspector] public Vector3 startingPos;
         [HideInInspector] public Quaternion startingRot;
diff --git a/ml-agents-envs/mlagents_envs/registry/binary_utils.py b/ml-agents-envs/mlagents_envs/registry/binary_utils.py
@@ -161,7 +161,7 @@ def download_and_extract_zip(
     try:
         request = urllib.request.urlopen(url, timeout=30)
     except urllib.error.HTTPError as e:  # type: ignore
-        e.reason = f"{e.reason} {url}"
+        e.reason = f"{e.reason} {url}"  # type: ignore
         raise
     zip_size = int(request.headers["content-length"])
     zip_file_path = os.path.join(zip_dir, str(uuid.uuid4()) + ".zip")
@@ -217,7 +217,7 @@ def load_remote_manifest(url: str) -> Dict[str, Any]:
     try:
         request = urllib.request.urlopen(url, timeout=30)
     except urllib.error.HTTPError as e:  # type: ignore
-        e.reason = f"{e.reason} {url}"
+        e.reason = f"{e.reason} {url}"  # type: ignore
         raise
     manifest_path = os.path.join(tmp_dir, str(uuid.uuid4()) + ".yaml")
     with open(manifest_path, "wb") as manifest:
diff --git a/ml-agents/mlagents/trainers/tests/torch_entities/test_reward_providers/test_extrinsic.py b/ml-agents/mlagents/trainers/tests/torch_entities/test_reward_providers/test_extrinsic.py
@@ -78,10 +78,11 @@ def test_reward(behavior_spec: BehaviorSpec, reward: float) -> None:
     # the groupmate rewards.
     buffer[BufferKey.GROUP_REWARD] = buffer[BufferKey.ENVIRONMENT_REWARDS]
     # 2 agents with identical rewards
-    buffer[BufferKey.GROUPMATE_REWARDS].set(
+    data = [
         [np.ones(1, dtype=np.float32) * reward] * 2
         for _ in range(buffer.num_experiences)
-    )
+    ]
+    buffer[BufferKey.GROUPMATE_REWARDS].set(data)
     generated_rewards = extrinsic_rp.evaluate(buffer)
     assert (generated_rewards == 2 * reward).all()
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Unity.MLAgentsExamples`
`11`	`11`	`[System.Serializable]`
`12`	`12`	`public class BodyPart`
`13`	`13`	`{`
`14`		`- [Header("Body Part Info")] [Space(10)] public ConfigurableJoint joint;`
	`14`	`+ [Header("Body Part Info")][Space(10)] public ConfigurableJoint joint;`
`15`	`15`	`public Rigidbody rb;`
`16`	`16`	`[HideInInspector] public Vector3 startingPos;`
`17`	`17`	`[HideInInspector] public Quaternion startingRot;`