Compare commits

...

7 Commits

Author SHA1 Message Date
dependabot[bot]
6ea5068f0f Bump ts-jest from 25.5.0 to 25.5.1 (#101)
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 25.5.0 to 25.5.1.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v25.5.0...v25.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-05-11 17:27:45 +00:00
CrazyMax
d2071be44b Update README 2020-05-11 19:26:15 +02:00
CrazyMax
4c4869581a Update README 2020-05-11 19:25:43 +02:00
CrazyMax
8e8e4b8c59 Add automerge workflow 2020-05-11 19:25:37 +02:00
CrazyMax
03544b5b3e Update workflows 2020-05-11 19:25:28 +02:00
CrazyMax
1412a4b386 Update action yml 2020-05-11 19:25:20 +02:00
CrazyMax
58600ce61a Update CI workflow 2020-05-07 12:52:35 +02:00
11 changed files with 64 additions and 18 deletions

46
.github/workflows/automerge.yml vendored Normal file
View File

@@ -0,0 +1,46 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- unlocked
check_suite:
types:
- completed
status: {}
jobs:
dependabot:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
steps:
-
name: Approve
uses: actions/github-script@0.9.0
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
await github.pulls.createReview({
owner: context.payload.repository.owner.login,
repo: context.payload.repository.name,
pull_number: context.payload.pull_request.number,
event: 'APPROVE'
})
-
name: Wait
run: sleep 3
-
name: Merge
uses: actions/github-script@0.9.0
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
await github.pulls.merge({
owner: context.payload.repository.owner.login,
repo: context.payload.repository.name,
pull_number: context.payload.pull_request.number,
merge_method: 'squash'
})

View File

@@ -17,12 +17,13 @@ jobs:
os:
- ubuntu-latest
- windows-latest
version:
- latest
- v3.95
include:
- os: ubuntu-latest
version: latest
file: https://github.com/crazy-max/firefox-history-merger/releases/download/2.4.0/firefox-history-merger-linux-amd64
- os: windows-latest
version: latest
file: https://github.com/crazy-max/firefox-history-merger/releases/download/2.4.0/firefox-history-merger-windows-4.0-amd64.exe
steps:
-

View File

@@ -13,11 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
-
# https://github.com/actions/checkout
name: Checkout
uses: actions/checkout@v2
-
# https://github.com/crazy-max/ghaction-github-labeler
name: Run Labeler
if: success()
uses: crazy-max/ghaction-github-labeler@v2

View File

@@ -11,11 +11,9 @@ jobs:
runs-on: ubuntu-latest
steps:
-
# https://github.com/actions/checkout
name: Checkout
uses: actions/checkout@v2
-
# https://github.com/actions/setup-node
name: Set up Node
uses: actions/setup-node@v1
-

View File

@@ -10,7 +10,6 @@ jobs:
runs-on: ubuntu-latest
steps:
-
# https://github.com/actions/checkout
name: Checkout
uses: actions/checkout@v2
-

View File

@@ -19,7 +19,6 @@ jobs:
- windows-latest
steps:
-
# https://github.com/actions/checkout
name: Checkout
uses: actions/checkout@v2
-
@@ -29,7 +28,6 @@ jobs:
name: Test
run: npm run test
-
# https://github.com/codecov/codecov-action
name: Upload coverage
uses: codecov/codecov-action@v1
if: success()

View File

@@ -1,5 +1,9 @@
# Changelog
## 1.3.2 (2020/05/11)
* Update README
## 1.3.1 (2020/05/07)
* Code cleanup

View File

@@ -40,11 +40,11 @@ jobs:
Following inputs can be used as `step.with` keys
| Name | Type | Default | Description |
|---------------|---------|-----------|-------------------------------|
| `version` | String | `latest` | UPX version. Example: `v3.95` |
| `file` | String | | File to compress |
| `args` | String | | Arguments to pass to UPX |
| Name | Type | Default | Description |
|---------------|---------|-----------|---------------------------------|
| `version` | String | `latest` | UPX version. Example: `v3.95` |
| `file` | String | | File to compress (**required**) |
| `args` | String | | Arguments to pass to UPX |
## Limitation

View File

@@ -10,11 +10,13 @@ inputs:
version:
description: 'UPX version. Example: 3.95'
default: 'latest'
required: false
file:
description: 'File to compress'
required: true
args:
description: 'Arguments to pass to UPX'
required: false
runs:
using: 'node12'

6
package-lock.json generated
View File

@@ -4999,9 +4999,9 @@
}
},
"ts-jest": {
"version": "25.5.0",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.0.tgz",
"integrity": "sha512-govrjbOk1UEzcJ5cX5k8X8IUtFuP3lp3mrF3ZuKtCdAOQzdeCM7qualhb/U8s8SWFwEDutOqfF5PLkJ+oaYD4w==",
"version": "25.5.1",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.1.tgz",
"integrity": "sha512-kHEUlZMK8fn8vkxDjwbHlxXRB9dHYpyzqKIGDNxbzs+Rz+ssNDSDNusEK8Fk/sDd4xE6iKoQLfFkFVaskmTJyw==",
"dev": true,
"requires": {
"bs-logger": "0.x",

View File

@@ -35,7 +35,7 @@
"jest-runtime": "^25.5.4",
"prettier": "^2.0.5",
"removeNPMAbsolutePaths": "^2.0.0",
"ts-jest": "^25.5.0",
"ts-jest": "^25.5.1",
"typescript": "^3.8.3",
"typescript-formatter": "^7.2.2"
}