Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Account for Forked PRs + refactor testing #45

Merged
merged 4 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
version: 0.1
cli:
version: 1.12.0
version: 1.19.0
plugins:
sources:
- id: trunk
ref: v0.0.21
ref: v1.4.2
uri: https://github.com/trunk-io/plugins
- id: configs
uri: https://github.com/trunk-io/configs
ref: v0.0.3
ref: v1.0.2
lint:
disabled:
- eslint
enabled:
- git-diff-check
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
ignore:
- linters: [ALL]
paths:
- node_modules/**
runtimes:
enabled:
- [email protected]
- [email protected]
4 changes: 3 additions & 1 deletion action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:
trunk-token:
description:
Repo or Organization API token used for authentication. Can be found at app.trunk.io.
required: true
required: false # Required for any workflow not coming from a forked PR.
target-branch:
description:
The branch that the Merge Queue merges PRs into. If unspecified, defaults to the repository's
Expand Down Expand Up @@ -94,6 +94,8 @@ runs:
ACTOR: ${{ github.actor }}
API_TOKEN: ${{ inputs.trunk-token }}
REPOSITORY: ${{ github.repository }}
RUN_ID: ${{ github.run_id }}
IS_FORK: ${{ github.event.pull_request.head.repo.fork }}
TARGET_BRANCH: ${{ steps.prerequisites.outputs.merge_instance_branch }}
PR_NUMBER: ${{ github.event.pull_request.number }}
PR_SHA: ${{ steps.prerequisites.outputs.pr_branch_head_sha }}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@types/node": "20.4.2"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@types/express": "4.17.17",
"@types/jest": "29.5.3",
"@types/lodash": "4.14.195",
"express": "4.18.2",
"http-status-codes": "2.2.0",
Expand Down
Loading
Loading