Skip to content

Commit

Permalink
Merge pull request #49 from crazy-max/dependabot/npm_and_yarn/docker/…
Browse files Browse the repository at this point in the history
…actions-toolkit-0.16.0

build(deps): bump @docker/actions-toolkit from 0.14.0 to 0.16.0
  • Loading branch information
crazy-max authored Dec 18, 2023
2 parents 69b561f + e1c24ba commit d9be6ca
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 113 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
if: always()
uses: crazy-max/ghaction-dump-context@v2

colima-start-args:
lima-start-args:
runs-on: macos-latest
steps:
-
Expand All @@ -141,7 +141,7 @@ jobs:
name: Set up Docker
uses: ./
env:
COLIMA_START_ARGS: --cpu 4 --memory 8 --disk 32 --dns 1.1.1.1 --dns 8.8.8.8 --dns-host example.com=1.2.3.4
LIMA_START_ARGS: --cpus 4 --memory 8

build-linux:
runs-on: ubuntu-latest
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ___
* [Usage](#usage)
* [Quick start](#quick-start)
* [Daemon configuration](#daemon-configuration)
* [Define custom `colima start` arguments (macOS)](#define-custom-colima-start-arguments-macos)
* [Define custom `limactl start` arguments (macOS)](#define-custom-limactl-start-arguments-macos)
* [Customizing](#customizing)
* [inputs](#inputs)
* [Contributing](#contributing)
Expand Down Expand Up @@ -71,10 +71,10 @@ jobs:
}
```

### Define custom `colima start` arguments (macOS)
### Define custom `limactl start` arguments (macOS)

You can define custom [`colima start` arguments](https://github.com/abiosoft/colima#customizing-the-vm)
using the `COLIMA_START_ARGS` environment variable to customize the VM:
You can define custom [`limactl start` arguments](https://lima-vm.io/docs/reference/limactl_start/)
using the `LIMA_START_ARGS` environment variable to customize the VM:

```yaml
name: ci
Expand All @@ -90,14 +90,14 @@ jobs:
name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v2
env:
COLIMA_START_ARGS: --cpu 4 --memory 8 --disk 32
LIMA_START_ARGS: --cpus 4 --memory 8
```

## Customizing

### inputs

Following inputs can be used as `step.with` keys
The following inputs can be used as `step.with` keys

| Name | Type | Default | Description |
|-----------------|--------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------|
Expand Down
56 changes: 0 additions & 56 deletions TROUBLESHOOTING.md

This file was deleted.

10 changes: 5 additions & 5 deletions dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

25 changes: 0 additions & 25 deletions dist/licenses.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"packageManager": "yarn@3.6.3",
"dependencies": {
"@actions/core": "^1.10.1",
"@docker/actions-toolkit": "^0.14.0",
"@docker/actions-toolkit": "^0.16.0",
"uuid": "^9.0.1"
},
"devDependencies": {
Expand Down
48 changes: 31 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -900,9 +900,9 @@ __metadata:
languageName: node
linkType: hard

"@docker/actions-toolkit@npm:^0.14.0":
version: 0.14.0
resolution: "@docker/actions-toolkit@npm:0.14.0"
"@docker/actions-toolkit@npm:^0.16.0":
version: 0.16.0
resolution: "@docker/actions-toolkit@npm:0.16.0"
dependencies:
"@actions/cache": ^3.2.2
"@actions/core": ^1.10.1
Expand All @@ -911,16 +911,15 @@ __metadata:
"@actions/http-client": ^2.2.0
"@actions/io": ^1.1.3
"@actions/tool-cache": ^2.0.1
"@octokit/core": ^5.0.1
"@octokit/plugin-rest-endpoint-methods": ^10.1.5
"@octokit/core": ^5.0.2
"@octokit/plugin-rest-endpoint-methods": ^10.2.0
async-retry: ^1.3.3
csv-parse: ^5.5.2
csv-parse: ^5.5.3
handlebars: ^4.7.8
js-yaml: ^4.1.0
jwt-decode: ^4.0.0
semver: ^7.5.4
tmp: ^0.2.1
checksum: dbbdf6cbd962eb05b9ec2d3026a1cf97394839c4e595ec047efe5595ca773f8c3927e03b64a98469da96e56038e16d3d0ad91c500be787087777f14406cc9248
checksum: af2cfcee8a4b3e3ae46706a7f9f0ccdcecbfcf0b7b4f753b3f41e52256a8ece2446866f4f08c996f3aa50cd4047ec48258d9c571c22c2d1f0ebb3f2e36ff1270
languageName: node
linkType: hard

Expand Down Expand Up @@ -1417,6 +1416,21 @@ __metadata:
languageName: node
linkType: hard

"@octokit/core@npm:^5.0.2":
version: 5.0.2
resolution: "@octokit/core@npm:5.0.2"
dependencies:
"@octokit/auth-token": ^4.0.0
"@octokit/graphql": ^7.0.0
"@octokit/request": ^8.0.2
"@octokit/request-error": ^5.0.0
"@octokit/types": ^12.0.0
before-after-hook: ^2.2.0
universal-user-agent: ^6.0.0
checksum: 9ce060d61577f6805901ae5c33b2764a441db119ae0cca09104adf37b119cce68b656220de56c0c5004c9c9c1c892a7fdfbe9c0b1f5e398cb359dfd39c57eca8
languageName: node
linkType: hard

"@octokit/endpoint@npm:^9.0.0":
version: 9.0.1
resolution: "@octokit/endpoint@npm:9.0.1"
Expand Down Expand Up @@ -1475,14 +1489,14 @@ __metadata:
languageName: node
linkType: hard

"@octokit/plugin-rest-endpoint-methods@npm:^10.1.5":
version: 10.1.5
resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.1.5"
"@octokit/plugin-rest-endpoint-methods@npm:^10.2.0":
version: 10.2.0
resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.2.0"
dependencies:
"@octokit/types": ^12.3.0
peerDependencies:
"@octokit/core": ">=5"
checksum: 01b79eac7f1f5663c8bdb2f27a209873cebdf664b15712b4cc1f363f2a9df60f217e03af67a07000a4a7a70191080716ccc6d9fa454258f5cb2a09ef18723ee9
checksum: 3209688bf508d22a525fe32d632ff928b048688c1859c7e4bbb08bd181aa07f580b375a502e34368628103e5d5cccf7f9fb0ff0c8fd4262470ac8eeffb80ac6b
languageName: node
linkType: hard

Expand Down Expand Up @@ -2617,10 +2631,10 @@ __metadata:
languageName: node
linkType: hard

"csv-parse@npm:^5.5.2":
version: 5.5.2
resolution: "csv-parse@npm:5.5.2"
checksum: de2eb0c29b049783ef101b7eb843456200dc9a4fc9f4b400473bb0521b41aadb77af560cf4edc49bac65cc457b32596519860120181b26ec3b372109ddf8e8ea
"csv-parse@npm:^5.5.3":
version: 5.5.3
resolution: "csv-parse@npm:5.5.3"
checksum: 38399bc4c61b721bc2f52a6262d6000b4e5f391e45b071f6eb087b293a02f867020f7da36adf6f56eb9fb45bd28c82cd223afd35846551fb5ad31bf3d0602961
languageName: node
linkType: hard

Expand Down Expand Up @@ -2747,7 +2761,7 @@ __metadata:
resolution: "docker-setup-docker@workspace:."
dependencies:
"@actions/core": ^1.10.1
"@docker/actions-toolkit": ^0.14.0
"@docker/actions-toolkit": ^0.16.0
"@types/node": ^20.6.0
"@typescript-eslint/eslint-plugin": ^6.6.0
"@typescript-eslint/parser": ^6.6.0
Expand Down

0 comments on commit d9be6ca

Please sign in to comment.