Skip to content

Commit 972fffc

Browse files
[Scheduled] Update dependencies (#906)
1 parent c42fbd3 commit 972fffc

File tree

295 files changed

+22787
-12143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+22787
-12143
lines changed

.github/workflows/checks.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ jobs:
1010
tests:
1111
uses: ./.github/workflows/wf_check.yaml
1212
secrets:
13-
AWS_ACCOUNT_ID: ${{ secrets.AWS_PRODUCTION_CORE_ACCOUNT_ID }}
1413
NHOST_PAT: ${{ secrets.NHOST_PAT }}
15-
NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
16-
NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}
1714

1815
build_artifacts:
1916
strategy:
@@ -28,8 +25,3 @@ jobs:
2825
VERSION: ${{ github.sha }}
2926
secrets:
3027
NHOST_PAT: ${{ secrets.NHOST_PAT }}
31-
AWS_ACCOUNT_ID: ${{ secrets.AWS_PRODUCTION_CORE_ACCOUNT_ID }}
32-
CERT_FULL_CHAIN: ${{ secrets.CERT_FULL_CHAIN }}
33-
CERT_PRIV_KEY: ${{ secrets.CERT_PRIV_KEY }}
34-
NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
35-
NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}

.github/workflows/release.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ jobs:
88
tests:
99
uses: ./.github/workflows/wf_check.yaml
1010
secrets:
11-
AWS_ACCOUNT_ID: ${{ secrets.AWS_PRODUCTION_CORE_ACCOUNT_ID }}
1211
NHOST_PAT: ${{ secrets.NHOST_PAT }}
13-
NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
14-
NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}
1512

1613
build_artifacts:
1714
strategy:
@@ -25,11 +22,6 @@ jobs:
2522
VERSION: ${{ github.ref_name }}
2623
secrets:
2724
NHOST_PAT: ${{ secrets.NHOST_PAT }}
28-
AWS_ACCOUNT_ID: ${{ secrets.AWS_PRODUCTION_CORE_ACCOUNT_ID }}
29-
CERT_FULL_CHAIN: ${{ secrets.CERT_FULL_CHAIN }}
30-
CERT_PRIV_KEY: ${{ secrets.CERT_PRIV_KEY }}
31-
NIX_CACHE_PUB_KEY: ${{ secrets.NIX_CACHE_PUB_KEY }}
32-
NIX_CACHE_PRIV_KEY: ${{ secrets.NIX_CACHE_PRIV_KEY }}
3325

3426
publish:
3527
uses: ./.github/workflows/wf_publish.yaml

.github/workflows/wf_build_artifacts.yaml

+10-52
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ on:
1717
secrets:
1818
NHOST_PAT:
1919
required: true
20-
AWS_ACCOUNT_ID:
21-
required: true
22-
CERT_FULL_CHAIN:
23-
required: true
24-
CERT_PRIV_KEY:
25-
required: true
26-
NIX_CACHE_PUB_KEY:
27-
required: true
28-
NIX_CACHE_PRIV_KEY:
29-
required: true
3020

3121
jobs:
3222
artifacts:
@@ -44,52 +34,27 @@ jobs:
4434
ref: ${{ inputs.GIT_REF }}
4535
submodules: true
4636

47-
- name: Configure aws
48-
uses: aws-actions/configure-aws-credentials@v4
37+
- uses: cachix/install-nix-action@v27
4938
with:
50-
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/github-actions-nhost-${{ github.event.repository.name }}
51-
aws-region: eu-central-1
52-
53-
- uses: nixbuild/nix-quick-install-action@v26
54-
with:
55-
nix_version: 2.16.2
56-
nix_conf: |
39+
install_url: "https://releases.nixos.org/nix/nix-2.22.3/install"
40+
install_options: "--no-daemon"
41+
extra_nix_config: |
5742
experimental-features = nix-command flakes
5843
sandbox = false
5944
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
60-
substituters = https://cache.nixos.org/?priority=40 s3://nhost-nix-cache?region=eu-central-1&priority=50
61-
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ${{ secrets.NIX_CACHE_PUB_KEY }}
62-
builders-use-substitutes = true
45+
substituters = https://cache.nixos.org/?priority=40
46+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
6347
64-
- name: Cache nix store
65-
uses: actions/cache@v4
48+
- uses: DeterminateSystems/magic-nix-cache-action@v7
6649
with:
67-
path: |
68-
/nix/store/**
69-
/nix/var/nix/*/*
70-
/nix/var/nix/db/*
71-
/nix/var/nix/db/*/**
72-
!/nix/var/nix/daemon-socket/socket
73-
!/nix/var/nix/userpool/*
74-
!/nix/var/nix/gc.lock
75-
!/nix/var/nix/db/big-lock
76-
!/nix/var/nix/db/reserved
77-
key: nix-build-${{ inputs.GOOS }}-${{ inputs.GOARCH}}-${{ hashFiles('flake.nix', 'flake.lock', '**.nix') }}
50+
diagnostic-endpoint: ""
51+
use-flakehub: false
52+
7853
- name: Compute common env vars
7954
id: vars
8055
run: |
8156
echo "VERSION=$(make get-version VERSION=${{ inputs.VERSION }})" >> $GITHUB_OUTPUT
8257
83-
# - name: place let's encrypt cert
84-
# run: |
85-
# cat <<EOF > ssl/.ssl/fullchain.pem
86-
# ${{ secrets.CERT_FULL_CHAIN }}
87-
# EOF
88-
# cat <<EOF > ssl/.ssl/privkey.pem
89-
# ${{ secrets.CERT_PRIV_KEY }}
90-
# EOF
91-
# shell: bash
92-
9358
- name: "Build artifact"
9459
run: |
9560
make build ARCH=${{ inputs.GOARCH }} OS=${{ inputs.GOOS }}
@@ -140,10 +105,3 @@ jobs:
140105
path: result
141106
retention-days: 7
142107
if: ${{ ( inputs.GOOS == 'linux' ) }}
143-
144-
- name: "Cache nix store on s3"
145-
run: |
146-
echo ${{ secrets.NIX_CACHE_PRIV_KEY }} > cache-priv-key.pem
147-
nix store sign --key-file cache-priv-key.pem --all
148-
find /nix/store -maxdepth 1 -name "*-*" -type d | grep -v source | xargs -n 1000 nix copy --to s3://nhost-nix-cache\?region=eu-central-1
149-
if: always()

.github/workflows/wf_check.yaml

+9-38
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ on:
88
secrets:
99
NHOST_PAT:
1010
required: true
11-
AWS_ACCOUNT_ID:
12-
required: true
13-
NIX_CACHE_PUB_KEY:
14-
required: true
15-
NIX_CACHE_PRIV_KEY:
16-
required: true
1711

1812
jobs:
1913
tests:
@@ -31,46 +25,23 @@ jobs:
3125
ref: ${{ inputs.GIT_REF }}
3226
submodules: true
3327

34-
- name: Configure aws
35-
uses: aws-actions/configure-aws-credentials@v4
28+
- uses: cachix/install-nix-action@v27
3629
with:
37-
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/github-actions-nhost-${{ github.event.repository.name }}
38-
aws-region: eu-central-1
39-
40-
- uses: nixbuild/nix-quick-install-action@v26
41-
with:
42-
nix_version: 2.16.2
43-
nix_conf: |
30+
install_url: "https://releases.nixos.org/nix/nix-2.22.3/install"
31+
install_options: "--no-daemon"
32+
extra_nix_config: |
4433
experimental-features = nix-command flakes
4534
sandbox = false
4635
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
47-
substituters = https://cache.nixos.org/?priority=40 s3://nhost-nix-cache?region=eu-central-1&priority=50
48-
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ${{ secrets.NIX_CACHE_PUB_KEY }}
49-
builders-use-substitutes = true
36+
substituters = https://cache.nixos.org/?priority=40
37+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
5038
51-
- name: Cache nix store
52-
uses: actions/cache@v4
39+
- uses: DeterminateSystems/magic-nix-cache-action@v7
5340
with:
54-
path: |
55-
/nix/store/**
56-
/nix/var/nix/*/*
57-
/nix/var/nix/db/*
58-
/nix/var/nix/db/*/**
59-
!/nix/var/nix/daemon-socket/socket
60-
!/nix/var/nix/userpool/*
61-
!/nix/var/nix/gc.lock
62-
!/nix/var/nix/db/big-lock
63-
!/nix/var/nix/db/reserved
64-
key: nix-${{ runner.os }}-${{ hashFiles('flake.nix', 'flake.lock', '**.nix') }}
41+
diagnostic-endpoint: ""
42+
use-flakehub: false
6543

6644
- name: "Run checks"
6745
run: |
6846
export NHOST_PAT=${{ secrets.NHOST_PAT }}
6947
make check
70-
71-
- name: "Cache nix store on s3"
72-
run: |
73-
echo ${{ secrets.NIX_CACHE_PRIV_KEY }} > cache-priv-key.pem
74-
nix store sign --key-file cache-priv-key.pem --all
75-
find /nix/store -maxdepth 1 -name "*-*" -type d | grep -v source | xargs -n 1000 nix copy --to s3://nhost-nix-cache\?region=eu-central-1
76-
if: always()

cert.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ certbot certonly \
4343
--config-dir letsencrypt \
4444
--work-dir letsencrypt
4545

46-
cp letsencrypt/live/local.auth.nhost.run/fullchain.pem ssl/.ssl/sub-fullchain.pem
47-
cp letsencrypt/live/local.auth.nhost.run/privkey.pem ssl/.ssl/sub-privkey.pem
46+
cp letsencrypt/live/auth.local.nhost.run/fullchain.pem ssl/.ssl/sub-fullchain.pem
47+
cp letsencrypt/live/auth.local.nhost.run/privkey.pem ssl/.ssl/sub-privkey.pem
4848

4949
rm -rf letsencrypt

examples/myproject/nhost/nhost.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name = 'GREET'
44
value = 'Sayonara'
55

66
[hasura]
7-
version = 'v2.33.4-ce'
7+
version = 'v2.38.0-ce'
88
adminSecret = '{{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }}'
99
webhookSecret = '{{ secrets.NHOST_WEBHOOK_SECRET }}'
1010

@@ -22,7 +22,7 @@ liveQueriesMultiplexedRefetchInterval = 3000
2222
version = 20
2323

2424
[auth]
25-
version = '0.30.0'
25+
version = '0.33.0'
2626

2727
[auth.redirections]
2828
clientUrl = 'http://localhost:3000'
@@ -127,7 +127,7 @@ timeout = 60000
127127
enabled = false
128128

129129
[postgres]
130-
version = '14.11-20240429-1'
130+
version = '16.2-20240901-1'
131131

132132
[postgres.settings]
133133
maxConnections = 100
@@ -151,7 +151,7 @@ maxParallelMaintenanceWorkers = 2
151151
[provider]
152152

153153
[storage]
154-
version = '0.6.0'
154+
version = '0.6.1'
155155

156156
[observability]
157157
[observability.grafana]

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)