Skip to content

Commit 3fcfc31

Browse files
sandydoosandydoo
authored
Merge pull request #193 from cachix/bump-deps
Bump dependencies
2 parents b3ccead + 0874ded commit 3fcfc31

16 files changed

+25936
-3134
lines changed

‎.envrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
1+
source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k="
22

3-
use devenv
3+
use devenv

‎.github/dependabot.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
version: 2
22
updates:
3-
4-
- package-ecosystem: github-actions
5-
directory: "/"
6-
schedule:
7-
interval: daily
8-
time: '00:00'
9-
timezone: UTC
10-
open-pull-requests-limit: 10
11-
commit-message:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "00:00"
8+
timezone: UTC
9+
open-pull-requests-limit: 10
10+
commit-message:
1211
prefix: "chore"
13-
include: "scope"
12+
include: "scope"

‎.github/workflows/test.yml

+75-75
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
useDaemon: [true, false]
1717
runs-on: ${{ matrix.os }}
1818
steps:
19-
- uses: actions/checkout@v4
20-
- run: yarn install --frozen-lockfile
21-
- run: yarn build
22-
# check if typescript generation was committed
23-
- run: git diff --exit-code
24-
- uses: cachix/install-nix-action@v30
25-
- name: Test public cache
26-
uses: ./
27-
with:
28-
name: cachix-action
29-
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
30-
useDaemon: ${{ matrix.useDaemon }}
31-
- run: nix-build test.nix
19+
- uses: actions/checkout@v4
20+
- run: yarn install --frozen-lockfile
21+
- run: yarn build
22+
# check if typescript generation was committed
23+
- run: git diff --exit-code
24+
- uses: cachix/install-nix-action@v30
25+
- name: Test public cache
26+
uses: ./
27+
with:
28+
name: cachix-action
29+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
30+
useDaemon: ${{ matrix.useDaemon }}
31+
- run: nix-build test.nix
3232

3333
public-cache-no-signing-key:
3434
strategy:
@@ -37,16 +37,16 @@ jobs:
3737
useDaemon: [true, false]
3838
runs-on: ${{ matrix.os }}
3939
steps:
40-
- uses: actions/checkout@v4
41-
- run: yarn install --frozen-lockfile
42-
- run: yarn build
43-
- uses: cachix/install-nix-action@v30
44-
- name: Test public cache no signing key
45-
uses: ./
46-
with:
47-
name: cachix-action
48-
useDaemon: ${{ matrix.useDaemon }}
49-
- run: nix-build test.nix
40+
- uses: actions/checkout@v4
41+
- run: yarn install --frozen-lockfile
42+
- run: yarn build
43+
- uses: cachix/install-nix-action@v30
44+
- name: Test public cache no signing key
45+
uses: ./
46+
with:
47+
name: cachix-action
48+
useDaemon: ${{ matrix.useDaemon }}
49+
- run: nix-build test.nix
5050

5151
private-cache:
5252
if: ${{ github.ref == 'refs/heads/master' }}
@@ -56,76 +56,76 @@ jobs:
5656
useDaemon: [true, false]
5757
runs-on: ${{ matrix.os }}
5858
steps:
59-
- uses: actions/checkout@v4
60-
- run: yarn install --frozen-lockfile
61-
- run: yarn build
62-
- uses: cachix/install-nix-action@v30
63-
- name: Test private cache
64-
uses: ./
65-
with:
66-
name: cachix-action-private
67-
signingKey: '${{ secrets.CACHIX_SIGNING_KEY_PRIVATE }}'
68-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
69-
useDaemon: ${{ matrix.useDaemon }}
70-
- run: nix-build test.nix
59+
- uses: actions/checkout@v4
60+
- run: yarn install --frozen-lockfile
61+
- run: yarn build
62+
- uses: cachix/install-nix-action@v30
63+
- name: Test private cache
64+
uses: ./
65+
with:
66+
name: cachix-action-private
67+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY_PRIVATE }}"
68+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
69+
useDaemon: ${{ matrix.useDaemon }}
70+
- run: nix-build test.nix
7171

7272
push-paths:
7373
strategy:
7474
matrix:
7575
os: [ubuntu-latest, macos-latest]
7676
runs-on: ${{ matrix.os }}
7777
steps:
78-
- uses: actions/checkout@v4
79-
- run: yarn install --frozen-lockfile
80-
- run: yarn build
81-
- uses: cachix/install-nix-action@v30
82-
- id: paths
83-
run: |
84-
paths=$(nix-instantiate test.nix | tr '\n' ' ')
85-
echo "OUT_PATHS=$paths" >> $GITHUB_OUTPUT
86-
- name: Test pushPaths
87-
uses: ./
88-
with:
89-
name: cachix-action
90-
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
91-
pathsToPush: '${{ steps.paths.outputs.OUT_PATHS }}'
78+
- uses: actions/checkout@v4
79+
- run: yarn install --frozen-lockfile
80+
- run: yarn build
81+
- uses: cachix/install-nix-action@v30
82+
- id: paths
83+
run: |
84+
paths=$(nix-instantiate test.nix | tr '\n' ' ')
85+
echo "OUT_PATHS=$paths" >> $GITHUB_OUTPUT
86+
- name: Test pushPaths
87+
uses: ./
88+
with:
89+
name: cachix-action
90+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
91+
pathsToPush: "${{ steps.paths.outputs.OUT_PATHS }}"
9292

9393
installCommand:
9494
strategy:
9595
matrix:
9696
os: [ubuntu-latest, macos-latest]
9797
runs-on: ${{ matrix.os }}
9898
steps:
99-
- uses: actions/checkout@v4
100-
- run: yarn install --frozen-lockfile
101-
- run: yarn build
102-
- uses: cachix/install-nix-action@v30
103-
- name: Test private cache
104-
uses: ./
105-
with:
106-
name: cachix-action
107-
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
108-
installCommand: 'nix-env -j8 -f https://cachix.org/api/v1/install -iA cachix'
109-
- run: nix-build test.nix
99+
- uses: actions/checkout@v4
100+
- run: yarn install --frozen-lockfile
101+
- run: yarn build
102+
- uses: cachix/install-nix-action@v30
103+
- name: Test private cache
104+
uses: ./
105+
with:
106+
name: cachix-action
107+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
108+
installCommand: "nix-env -j8 -f https://cachix.org/api/v1/install -iA cachix"
109+
- run: nix-build test.nix
110110

111111
nix-master:
112112
strategy:
113113
matrix:
114114
os: [ubuntu-latest, macos-13]
115115
runs-on: ${{ matrix.os }}
116116
steps:
117-
- uses: actions/checkout@v4
118-
- name: Install Nix
119-
uses: cachix/install-nix-action@v30
120-
with:
121-
nix_path: nixpkgs=channel:nixos-22.11
122-
install_url: https://nixos-nix-install-tests.cachix.org/serve/kkq45x7yrzvxq8627fi6hkswnfa7mg2l/install
123-
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
124-
- run: yarn install --frozen-lockfile
125-
- run: yarn build
126-
- name: Test public cache
127-
uses: ./
128-
with:
129-
name: cachix-action
130-
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
131-
- run: nix-build test.nix
117+
- uses: actions/checkout@v4
118+
- name: Install Nix
119+
uses: cachix/install-nix-action@v30
120+
with:
121+
nix_path: nixpkgs=channel:nixos-22.11
122+
install_url: https://nixos-nix-install-tests.cachix.org/serve/kkq45x7yrzvxq8627fi6hkswnfa7mg2l/install
123+
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
124+
- run: yarn install --frozen-lockfile
125+
- run: yarn build
126+
- name: Test public cache
127+
uses: ./
128+
with:
129+
name: cachix-action
130+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
131+
- run: nix-build test.nix

‎README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,20 @@ Note that malicious code submitted via forked pull request can, once merged into
3535

3636
## Hacking
3737

38-
Install the dependencies
38+
Install the dependencies
39+
3940
```bash
4041
$ yarn install
4142
```
4243

4344
Build the typescript
45+
4446
```bash
4547
$ yarn build
4648
```
4749

48-
Run the tests :heavy_check_mark:
50+
Run the tests :heavy_check_mark:
51+
4952
```bash
5053
$ yarn test
5154
```

‎action.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
name: 'Cachix'
2-
description: 'nix-build with the help of caching to Cachix'
3-
author: 'Domen Kožar'
1+
name: "Cachix"
2+
description: "nix-build with the help of caching to Cachix"
3+
author: "Domen Kožar"
44
inputs:
55
name:
6-
description: 'Name of a cachix cache to push and pull/substitute'
6+
description: "Name of a cachix cache to push and pull/substitute"
77
required: true
88
extraPullNames:
9-
description: 'Comma-separated list of names for extra cachix caches to pull/substitute'
9+
description: "Comma-separated list of names for extra cachix caches to pull/substitute"
1010
authToken:
11-
description: 'Authentication token for Cachix, needed for private cache access or to push using an Auth Token'
11+
description: "Authentication token for Cachix, needed for private cache access or to push using an Auth Token"
1212
signingKey:
13-
description: 'Signing key secret retrieved after creating binary cache on https://cachix.org'
13+
description: "Signing key secret retrieved after creating binary cache on https://cachix.org"
1414
skipPush:
15-
description: 'Set to true to disable pushing build results to the cache'
16-
default: 'false'
15+
description: "Set to true to disable pushing build results to the cache"
16+
default: "false"
1717
pathsToPush:
18-
description: 'Whitespace-separated list of paths to push. Leave empty to push every build result.'
18+
description: "Whitespace-separated list of paths to push. Leave empty to push every build result."
1919
pushFilter:
2020
description: 'Ignored if pathsToPush is set. Regular expression to exclude derivations for the cache push, for example "(-source$|nixpkgs\.tar\.gz$)". Warning: this filter does not guarantee it will not get pushed in case the path is part of the closure of something that will get pushed.'
2121
cachixArgs:
22-
description: 'Extra command-line arguments to pass to cachix. If empty, defaults to -j8'
22+
description: "Extra command-line arguments to pass to cachix. If empty, defaults to -j8"
2323
skipAddingSubstituter:
24-
description: 'Set to true to skip adding cachix cache as a substitute'
25-
default: 'false'
24+
description: "Set to true to skip adding cachix cache as a substitute"
25+
default: "false"
2626
useDaemon:
2727
description: "Push store paths to the cache as they're built with the Cachix Daemon"
28-
default: 'true'
28+
default: "true"
2929
cachixBin:
30-
description: 'Provide a custom path to the cachix binary'
30+
description: "Provide a custom path to the cachix binary"
3131
installCommand:
32-
description: 'Override the default cachix installation method'
32+
description: "Override the default cachix installation method"
3333
branding:
34-
color: 'blue'
35-
icon: 'database'
34+
color: "blue"
35+
icon: "database"
3636
runs:
37-
using: 'node20'
38-
main: 'dist/main/index.js'
39-
post: 'dist/main/index.js'
37+
using: "node20"
38+
main: "dist/main/index.js"
39+
post: "dist/main/index.js"

0 commit comments

Comments
 (0)