fix: re-target the PR workflow to run on pull_request

newrelic · Feb 20, 2023 · 3fc17f0 · 3fc17f0
1 parent 5d9dae2
commit 3fc17f0
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 122 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -1,135 +1,135 @@
 name: Pull Request
 on:
-  # pull_request:
-  #   branches:
-  #     - main
-  push:
+  pull_request:
     branches:
-      - fix/build
+      - main
 
 env:
   THIRD_PARTY_GIT_AUTHOR_EMAIL: opensource+bot@newrelic.com
   THIRD_PARTY_GIT_AUTHOR_NAME: nr-opensource-bot
 
 jobs:
-  # job-test-unit:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-
-  #     - name: Setup Node
-  #       uses: actions/setup-node@v2
-  #       with:
-  #         node-version: 16
-
-  #     - name: Cache node_modules
-  #       id: cache-node-modules
-  #       uses: actions/cache@v2
-  #       env:
-  #         cache-name: node-modules
-  #       with:
-  #         path: ~/.npm
-  #         key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-${{ env.cache-name }}-
-
-  #     - name: Install Dependencies
-  #       run: npm ci
-
-  #     - name: Lint
-  #       run: npm run lint
-
-  #     - name: Typescript Build
-  #       run: npm run build
-
-  #     - name: NCC Package
-  #       run: npm run package
-
-  #     - name: Test
-  #       run: npm run test
-
-  #     - name: Coverage
-  #       uses: codecov/codecov-action@v1
-
-  # job-test-system:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-
-  #     - name: Cache Docker layers
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: /tmp/.buildx-cache
-  #         key: ${{ runner.os }}-buildx-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-buildx-
-
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v1
-
-  #     - name: Docker Build
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         tags: ${{ github.repository }}:latest
-  #         load: true
-  #         cache-from: type=local,src=/tmp/.buildx-cache
-  #         cache-to: type=local,dest=/tmp/.buildx-cache
-
-  #     - name: Run Action (JSON)
-  #       id: repolinter-json
-  #       run: >
-  #         docker run -t
-  #         -v ${{ github.workspace }}:/github/workspace -w /github/workspace
-  #         -e INPUT_DIRECTORY=/github/workspace
-  #         -e INPUT_TOKEN=${{ github.token }}
-  #         -e INPUT_USERNAME=app/github-actions
-  #         -e INPUT_CONFIG_FILE=./.github/workflows/test-rulesets/repolinter-test.json
-  #         -e INPUT_REPOSITORY=${{ github.repository }}
-  #         -e INPUT_OUTPUT_TYPE=exit-code
-  #         -e INPUT_OUTPUT_NAME="[Repolinter] Open Source Policy Issues"
-  #         -e INPUT_LABEL_NAME=repolinter
-  #         -e INPUT_LABEL_COLOR=fbca04
-  #         -e GITHUB_RUN_NUMBER=${{ github.run_number }}
-  #         -e GITHUB_ACTION=true
-  #         ${{ github.repository }}:latest
-
-  #     - name: Verify Outputs
-  #       env:
-  #         DID_ERROR: ${{ steps.repolinter-json.outputs.errored }}
-  #         DID_PASS: ${{ steps.repolinter-json.outputs.passed }}
-  #       shell: bash
-  #       run: '[ "$DID_ERROR" = "false" ] && [ "$DID_PASS" = "true" ]'
-
-  #     - name: Run Action (YAML)
-  #       id: repolinter-yaml
-  #       run: >
-  #         docker run -t
-  #         -v ${{ github.workspace }}:/github/workspace -w /github/workspace
-  #         -e INPUT_DIRECTORY=/github/workspace
-  #         -e INPUT_TOKEN=${{ github.token }}
-  #         -e INPUT_USERNAME=app/github-actions
-  #         -e INPUT_CONFIG_FILE=./.github/workflows/test-rulesets/repolinter-test.yaml
-  #         -e INPUT_REPOSITORY=${{ github.repository }}
-  #         -e INPUT_OUTPUT_TYPE=exit-code
-  #         -e INPUT_OUTPUT_NAME="[Repolinter] Open Source Policy Issues"
-  #         -e INPUT_LABEL_NAME=repolinter
-  #         -e INPUT_LABEL_COLOR=fbca04
-  #         -e GITHUB_RUN_NUMBER=${{ github.run_number }}
-  #         -e GITHUB_ACTION=true
-  #         ${{ github.repository }}:latest
-
-  #     - name: Verify Outputs
-  #       env:
-  #         DID_ERROR: ${{ steps.repolinter-yaml.outputs.errored }}
-  #         DID_PASS: ${{ steps.repolinter-yaml.outputs.passed }}
-  #       shell: bash
-  #       run: '[ "$DID_ERROR" = "false" ] && [ "$DID_PASS" = "true" ]'
+  job-test-unit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        env:
+          cache-name: node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Typescript Build
+        run: npm run build
+
+      - name: NCC Package
+        run: npm run package
 
+      - name: Test
+        run: npm run test
+
+      - name: Coverage
+        uses: codecov/codecov-action@v1
+
+  job-test-system:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker Build
+        uses: docker/build-push-action@v2
+        with:
+          tags: ${{ github.repository }}:latest
+          load: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Run Action (JSON)
+        id: repolinter-json
+        run: >
+          docker run -t
+          -v ${{ github.workspace }}:/github/workspace -w /github/workspace
+          -e INPUT_DIRECTORY=/github/workspace
+          -e INPUT_TOKEN=${{ github.token }}
+          -e INPUT_USERNAME=app/github-actions
+          -e INPUT_CONFIG_FILE=./.github/workflows/test-rulesets/repolinter-test.json
+          -e INPUT_REPOSITORY=${{ github.repository }}
+          -e INPUT_OUTPUT_TYPE=exit-code
+          -e INPUT_OUTPUT_NAME="[Repolinter] Open Source Policy Issues"
+          -e INPUT_LABEL_NAME=repolinter
+          -e INPUT_LABEL_COLOR=fbca04
+          -e GITHUB_RUN_NUMBER=${{ github.run_number }}
+          -e GITHUB_ACTION=true
+          ${{ github.repository }}:latest
+
+      - name: Verify Outputs
+        env:
+          DID_ERROR: ${{ steps.repolinter-json.outputs.errored }}
+          DID_PASS: ${{ steps.repolinter-json.outputs.passed }}
+        shell: bash
+        run: '[ "$DID_ERROR" = "false" ] && [ "$DID_PASS" = "true" ]'
+
+      - name: Run Action (YAML)
+        id: repolinter-yaml
+        run: >
+          docker run -t
+          -v ${{ github.workspace }}:/github/workspace -w /github/workspace
+          -e INPUT_DIRECTORY=/github/workspace
+          -e INPUT_TOKEN=${{ github.token }}
+          -e INPUT_USERNAME=app/github-actions
+          -e INPUT_CONFIG_FILE=./.github/workflows/test-rulesets/repolinter-test.yaml
+          -e INPUT_REPOSITORY=${{ github.repository }}
+          -e INPUT_OUTPUT_TYPE=exit-code
+          -e INPUT_OUTPUT_NAME="[Repolinter] Open Source Policy Issues"
+          -e INPUT_LABEL_NAME=repolinter
+          -e INPUT_LABEL_COLOR=fbca04
+          -e GITHUB_RUN_NUMBER=${{ github.run_number }}
+          -e GITHUB_ACTION=true
+          ${{ github.repository }}:latest
+
+      - name: Verify Outputs
+        env:
+          DID_ERROR: ${{ steps.repolinter-yaml.outputs.errored }}
+          DID_PASS: ${{ steps.repolinter-yaml.outputs.passed }}
+        shell: bash
+        run: '[ "$DID_ERROR" = "false" ] && [ "$DID_PASS" = "true" ]'
+
+  # For testing only - uncomment and use this job to generate a pre-release
+  # Note: will also need to update the docker image used in action.yml once
+  # this worklfow publishes the image
   job-generate-pre-release:
     runs-on: ubuntu-latest
-    # needs: [job-test-unit, job-test-system]
+    needs: [job-test-unit, job-test-system]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -192,4 +192,4 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           tags: >-
-            ghcr.io/${{ github.repository }}:v1.7.0-pre
+            ghcr.io/${{ github.repository }}:${{ github.ref_name }}-${{ github.sha }}
diff --git a/action.yml b/action.yml
@@ -111,7 +111,7 @@ outputs:
     description: 'The JSON output from the repolinter run, from repolinter.jsonFormatter.'
 runs:
   using: 'docker'
-  image: docker://ghcr.io/newrelic/repolinter-action:v1.7.0-pre
+  image: docker://ghcr.io/newrelic/repolinter-action:v1.6.5
   env:
     INPUT_DIRECTORY: ${{ inputs.directory }}
     INPUT_TOKEN: ${{ inputs.token }}