Plugin E2E: Workflow fixes (#806)

grafana · Mar 11, 2024 · eb1b567 · eb1b567
1 parent 8c03a5f
commit eb1b567
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -70,7 +70,7 @@ jobs:
           GOOGLE_JWT_FILE: ${{ secrets.GOOGLE_JWT_FILE }}
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

diff --git a/docusaurus/docs/snippets/plugin-e2e-ds-workflow.npm.md b/docusaurus/docs/snippets/plugin-e2e-ds-workflow.npm.md
@@ -38,14 +38,14 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Install npm dependencies
+        run: npm ci
+
       - name: Install Mage
         uses: magefile/mage-action@v3
         with:
           install-only: true
 
-      - name: Install npm dependencies
-        run: npm ci
-
       - name: Build binaries
         run: mage -v build:linux
 
@@ -74,7 +74,7 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/

diff --git a/docusaurus/docs/snippets/plugin-e2e-ds-workflow.pnpm.md b/docusaurus/docs/snippets/plugin-e2e-ds-workflow.pnpm.md
@@ -40,14 +40,14 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Install pnpm dependencies
+        run: pnpm install --frozen-lockfile
+
       - name: Install Mage
         uses: magefile/mage-action@v3
         with:
           install-only: true
 
-      - name: Install pnpm dependencies
-        run: pnpm install --frozen-lockfile
-
       - name: Build binaries
         run: mage -v build:linux
 
@@ -76,14 +76,14 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/
           retention-days: 30
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

diff --git a/docusaurus/docs/snippets/plugin-e2e-ds-workflow.yarn.md b/docusaurus/docs/snippets/plugin-e2e-ds-workflow.yarn.md
@@ -38,14 +38,14 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Install yarn dependencies
+        run: yarn install
+
       - name: Install Mage
         uses: magefile/mage-action@v3
         with:
           install-only: true
 
-      - name: Install yarn dependencies
-        run: yarn install
-
       - name: Build binaries
         run: mage -v build:linux
 
@@ -74,14 +74,14 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/
           retention-days: 30
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

diff --git a/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.npm.md b/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.npm.md
@@ -66,14 +66,14 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/
           retention-days: 30
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

diff --git a/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.pnpm.md b/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.pnpm.md
@@ -68,14 +68,14 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/
           retention-days: 30
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

diff --git a/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.yarn.md b/docusaurus/docs/snippets/plugin-e2e-fe-plugin-workflow.yarn.md
@@ -66,14 +66,14 @@ jobs:
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login != 'grafana' }}
+        if: ${{ github.repository_owner != 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         with:
           name: playwright-report-${{ matrix.GRAFANA_IMAGE.NAME }}-v${{ matrix.GRAFANA_IMAGE.VERSION }}-${{github.run_id}}
           path: playwright-report/
           retention-days: 30
 
       - name: Publish report to GCS
-        if: ${{ (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') && github.event.organization.login == 'grafana' }}
+        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}