Skip to content

Commit f083495

Browse files
committed
chore: update environment URLs and increment package version to 0.1.3
1 parent 6a76e56 commit f083495

File tree

7 files changed

+43
-33
lines changed

7 files changed

+43
-33
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ DATABASE_URL=postgresql://user:password@localhost:5432/trivet
22
GOOGLE_OAUTH_CLIENT_ID=your-google-client-id
33
GOOGLE_OAUTH_CLIENT_SECRET=your-google-client-secret
44
TRIVET_SESSION_SECRET=replace-with-secure-random-string
5-
TRIVET_PUBLIC_BASE_URL=https://trivet.contraption.co
5+
TRIVET_PUBLIC_BASE_URL=https://trivet.sredevops.org

.github/workflows/ci.yml

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,37 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21-
22-
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
21+
name: Checkout repository
2322
with:
24-
version: "10"
25-
run_install: false
23+
fetch-depth: 1
2624

27-
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
28-
with:
29-
node-version: "20"
30-
cache: "pnpm"
25+
# - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
26+
# with:
27+
# version: "10"
28+
# run_install: false
29+
30+
# - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
31+
# with:
32+
# node-version: "20"
33+
# cache: "pnpm"
3134

32-
- name: Install dependencies
33-
run: pnpm install
35+
# - name: Install dependencies
36+
# run: pnpm install
3437

35-
- name: Prisma generate
36-
run: pnpm prisma:generate
38+
# - name: Prisma generate
39+
# run: pnpm prisma:generate
3740

38-
- name: Typecheck
39-
run: pnpm check
41+
# - name: Typecheck
42+
# run: pnpm check
4043

41-
- name: Lint
42-
run: pnpm lint
44+
# - name: Lint
45+
# run: pnpm lint
4346

44-
- name: Format check
45-
run: pnpm format:check
47+
# - name: Format check
48+
# run: pnpm format:check
4649

47-
- name: Build
48-
run: pnpm build
50+
# - name: Build
51+
# run: pnpm build
4952

5053
# - name: Docker build
5154
# run: docker build -t trivet .
@@ -55,10 +58,16 @@ jobs:
5558
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
5659
with:
5760
images: ${{ env.GHCR_IMAGE }}
58-
flavor: |
59-
latest=true
60-
prefix=
61-
suffix=-dev
61+
tags: |
62+
type=ref,event=branch
63+
type=ref,event=tag
64+
type=sha,format=short
65+
annotations: |
66+
org.opencontainers.image.created={{.Date}}
67+
labels: |
68+
org.opencontainers.image.source=${{ github.repository }}
69+
org.opencontainers.image.url=${{ github.event.repository.html_url }}
70+
org.opencontainers.image.revision=${{ github.sha }}
6271
6372
- name: Set up Docker Context for Buildx
6473
id: buildx-context
@@ -88,10 +97,11 @@ jobs:
8897
with:
8998
context: .
9099
file: Dockerfile
100+
push: true
91101
labels: ${{ steps.meta.outputs.labels }}
92102
annotations: ${{ steps.meta.outputs.annotations }}
93103
tags: ${{ steps.meta.outputs.tags }}
94104
outputs: type=image,name=${{ env.GHCR_IMAGE }},name-canonical=true,push=true,oci-mediatypes=true
95-
cache-from: type=gha,scope=${{ github.repository }}-${{ github.ref_name }}
96-
cache-to: type=gha,scope=${{ github.repository }}-${{ github.ref_name }}
105+
cache-from: type=gha
106+
cache-to: type=gha,mode=max
97107

app/api/auth/callback/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export async function GET(request: NextRequest) {
152152
const { searchParams } = request.nextUrl;
153153
const baseUrl = getPublicBaseUrl(request.headers, request.nextUrl.origin);
154154
const origin = new URL(baseUrl).origin;
155-
const shouldSendJunkDrawer = origin === "https://trivet.contraption.co";
155+
const shouldSendJunkDrawer = origin === "https://trivet.sredevops.org";
156156
const code = searchParams.get("code");
157157
const stateToken = searchParams.get("state");
158158

@@ -260,7 +260,7 @@ export async function GET(request: NextRequest) {
260260
export async function POST(request: NextRequest) {
261261
const baseUrl = getPublicBaseUrl(request.headers, request.nextUrl.origin);
262262
const origin = new URL(baseUrl).origin;
263-
const shouldSendJunkDrawer = origin === "https://trivet.contraption.co";
263+
const shouldSendJunkDrawer = origin === "https://trivet.sredevops.org";
264264
try {
265265
const body = (await request.json()) as {
266266
credential?: string;

app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const baseUrl = process.env.TRIVET_PUBLIC_BASE_URL
88
? new URL(process.env.TRIVET_PUBLIC_BASE_URL)
99
: new URL("http://localhost:3000");
1010
const shouldLoadPlausible =
11-
baseUrl.origin === "https://trivet.contraption.co";
11+
baseUrl.origin === "https://trivet.sredevops.org";
1212

1313
export const metadata: Metadata = {
1414
metadataBase: baseUrl,

app/robots.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { MetadataRoute } from "next";
22

33
export default function robots(): MetadataRoute.Robots {
44
const baseUrl =
5-
process.env.TRIVET_PUBLIC_BASE_URL ?? "https://trivet.contraption.co";
5+
process.env.TRIVET_PUBLIC_BASE_URL ?? "https://trivet.sredevops.org";
66

77
return {
88
rules: [

app/sitemap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { MetadataRoute } from "next";
22

33
export default function sitemap(): MetadataRoute.Sitemap {
44
const baseUrl =
5-
process.env.TRIVET_PUBLIC_BASE_URL ?? "https://trivet.contraption.co";
5+
process.env.TRIVET_PUBLIC_BASE_URL ?? "https://trivet.sredevops.org";
66

77
return [
88
{

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trivet",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"private": true,
55
"type": "module",
66
"overrides": {

0 commit comments

Comments
 (0)