Merge pull request #1449 from flexn-io/chore/e2e-enable

Chore/e2e enable on android
flexn-io · Mar 15, 2024 · 36dd311 · 36dd311
2 parents 54682bf + d1abdc7
commit 36dd311
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 56 deletions.
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-harness-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-harness-androidtv.yml b/.github/workflows/e2e-harness-androidtv.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-harness-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-template-android.yml b/.github/workflows/e2e-template-android.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-template-android:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-android' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup

diff --git a/.github/workflows/e2e-template-androidtv.yml b/.github/workflows/e2e-template-androidtv.yml
@@ -5,24 +5,24 @@ defaults:
         shell: zsh -l {0}
 on:
     workflow_dispatch:
-    # push:
-    #     branches:
-    #         - main
-    #         - 'release/**'
-    #     paths-ignore:
-    #         - 'docs/**'
-    #         - '**/README.md'
-    #         - '**/lerna.json'
-    #         - '**/metadata.json'
-    #         - '**/renative.json'
-    #         - '**/package.json'
-    # pull_request:
-    #     types: [labeled]
+    push:
+        branches:
+            - main
+            - 'release/**'
+        paths-ignore:
+            - 'docs/**'
+            - '**/README.md'
+            - '**/lerna.json'
+            - '**/metadata.json'
+            - '**/renative.json'
+            - '**/package.json'
+    pull_request:
+        types: [labeled]
 
 jobs:
     e2e-template-androidtv:
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-androidtv' || github.event.label.name == 'e2e' }}
-        runs-on: [self-hosted, macos, intel]
+        runs-on: [self-hosted, macos]
         steps:
             - uses: actions/checkout@v2
             - name: Setup