Skip to content

Commit 0d1ac9c

Browse files
authored
fix: offline signer setting (#2973)
2 parents 183d5f2 + cef44fe commit 0d1ac9c

File tree

17 files changed

+152
-117
lines changed

17 files changed

+152
-117
lines changed

.github/workflows/deploy-app.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ concurrency:
1919
env:
2020
NODE_OPTIONS: '--no-warnings'
2121
ACTIONS_RUNNER_DEBUG: true
22-
ASTRO_TELEMETRY_DISABLED: true
2322

2423
jobs:
2524
garnix:
@@ -64,6 +63,7 @@ jobs:
6463
pull-requests: write
6564
env:
6665
npm_config_yes: true
66+
ENVIRONMENT: 'preview'
6767
environment: 'app-preview'
6868
if: github.event_name == 'pull_request'
6969
steps:
@@ -72,11 +72,14 @@ jobs:
7272
lfs: true
7373
- uses: nixbuild/nix-quick-install-action@v28
7474
- name: Fetch from Cache
75+
env:
76+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
7577
run: |
7678
nix develop
7779
nix build .#app
7880
- name: '[preview] 🔶 Publish to Cloudflare Pages'
7981
env:
82+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
8083
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
8184
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
8285
run: npx --yes wrangler@latest pages --project-name="app" deploy result >> /tmp/app_deploy.txt
@@ -104,18 +107,22 @@ jobs:
104107
needs: [garnix]
105108
env:
106109
npm_config_yes: true
110+
ENVIRONMENT: 'preview'
107111
if: github.event_name == 'workflow_dispatch'
108112
steps:
109113
- uses: actions/checkout@v4
110114
with:
111115
lfs: true
112116
- uses: nixbuild/nix-quick-install-action@v28
113117
- name: Fetch from Cache
118+
env:
119+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
114120
run: |
115121
nix develop
116122
nix build .#app
117123
- name: '[workflow-dispatch] 🔶 Publish to Cloudflare Pages'
118124
env:
125+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
119126
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
120127
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
121128
run: npx --yes wrangler@latest pages --project-name="app" deploy result
@@ -125,6 +132,7 @@ jobs:
125132
needs: [garnix]
126133
env:
127134
npm_config_yes: true
135+
ENVIRONMENT: 'staging'
128136
environment: 'app-staging'
129137
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
130138
steps:
@@ -133,11 +141,14 @@ jobs:
133141
lfs: true
134142
- uses: nixbuild/nix-quick-install-action@v28
135143
- name: Fetch from Cache
144+
env:
145+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
136146
run: |
137147
nix develop
138148
nix build .#app
139149
- name: '[staging] 🔶 Publish to Cloudflare Pages'
140150
env:
151+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
141152
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
142153
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
143154
run: npx --yes wrangler@latest pages --project-name="app" --branch="staging" deploy result
@@ -147,6 +158,7 @@ jobs:
147158
needs: [garnix]
148159
env:
149160
npm_config_yes: true
161+
ENVIRONMENT: 'production'
150162
environment: 'app-production'
151163
if: github.event_name == 'push' && github.ref == 'refs/heads/release/app'
152164
steps:
@@ -155,11 +167,14 @@ jobs:
155167
lfs: true
156168
- uses: nixbuild/nix-quick-install-action@v28
157169
- name: Fetch from Cache
170+
env:
171+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
158172
run: |
159173
nix develop
160174
nix build .#app
161175
- name: '[production] 🔶 Publish to Cloudflare Pages'
162176
env:
177+
ENVIRONMENT: ${{ env.ENVIRONMENT }}
163178
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
164179
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
165180
run: npx --yes wrangler@latest pages --project-name="app" --branch="main" deploy result

app/.env.example

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ PORT=5433
22
NODE_ENV="development"
33

44
DEBUG_TABLE=false
5+
ENVIRONMENT="development"

app/app.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
perSystem = { pkgs, unstablePkgs, lib, ensureAtRepositoryRoot, ... }:
33
let
44
pkgsDeps = with pkgs; [ pkg-config python3 ];
5-
nodeDeps = with unstablePkgs; [ nodePackages_latest.nodejs ];
5+
nodeDeps = with unstablePkgs; [ nodePackages_latest.nodejs nodePackages_latest."patch-package" ];
66
combinedDeps = pkgsDeps ++ nodeDeps;
77
packageJSON = lib.importJSON ./package.json;
88
in
99
{
1010
packages = {
1111
app = unstablePkgs.buildNpmPackage {
12-
npmDepsHash = "sha256-8zhT3p1jem0kR6kGQpMGPb8lDPsshzUNSlT5hYuUb7k=";
12+
npmDepsHash = "sha256-KIxRD0SCb5yex5HmoZ3BbmNzyt7Y5RuZKdwuc3gtX78=";
1313
src = ./.;
1414
sourceRoot = "app";
15-
npmFlags = [ "--legacy-peer-deps" "--ignore-scripts" ];
15+
npmFlags = [ "--enable-pre-post-scripts" ];
1616
pname = packageJSON.name;
1717
version = packageJSON.version;
1818
nativeBuildInputs = combinedDeps;

app/environment.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ interface EnvironmentVariables {
1111
// `rollup-plugin-visualizer`
1212
readonly VISUALIZE: string
1313
readonly DEBUG_TABLE: "true" | "false"
14+
readonly ENVIRONMENT: "development" | "preview" | "staging" | "production"
1415
}
1516

1617
// Node.js environment variables types

0 commit comments

Comments
 (0)