diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2600422..9f95934 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: jobs: backend: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] services: postgres: image: postgres:17 @@ -16,7 +16,7 @@ jobs: POSTGRES_USER: relay POSTGRES_PASSWORD: relay POSTGRES_DB: relay_e2e - ports: ["5432:5432"] + ports: ["15432:5432"] options: >- --health-cmd pg_isready --health-interval 5s @@ -35,10 +35,10 @@ jobs: - run: go build ./... - run: go test ./... env: - RELAY_TEST_DATABASE_URL: postgres://relay:relay@127.0.0.1:5432/relay_e2e?sslmode=disable + RELAY_TEST_DATABASE_URL: postgres://relay:relay@127.0.0.1:15432/relay_e2e?sslmode=disable web: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: actions/setup-node@v7 @@ -52,7 +52,7 @@ jobs: - run: npm run build --prefix apps/web openapi: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: actions/setup-node@v7 @@ -66,7 +66,7 @@ jobs: diff -u packages/api-client/src/generated/schema.ts /tmp/schema.ts docker: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] permissions: packages: write contents: read @@ -93,7 +93,7 @@ jobs: docker push ghcr.io/dvorinka/relay:sha-${GITHUB_SHA:0:7} desktop: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: actions/setup-go@v7 @@ -137,7 +137,7 @@ jobs: path: apps/desktop/build/bin/relay-desktop security: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: aquasecurity/trivy-action@master diff --git a/.github/workflows/ployz-build.yml b/.github/workflows/ployz-build.yml index 14f7de9..12f916e 100644 --- a/.github/workflows/ployz-build.yml +++ b/.github/workflows/ployz-build.yml @@ -4,13 +4,12 @@ on: inputs: build: { required: true, type: string } cloud: { required: true, type: string } - runner: { required: false, type: string, default: ubuntu-latest } permissions: contents: read id-token: write jobs: build: - runs-on: ${{ inputs.runner }} + runs-on: [self-hosted, linux, x64] steps: - uses: getployz/build@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e833e1b..2b4c89b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: actions/setup-go@v7 @@ -146,7 +146,7 @@ jobs: # always set the secrets). apk: needs: build - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] env: ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} steps: @@ -194,7 +194,7 @@ jobs: # Publish the runtime image to GHCR: ghcr.io/dvorinka/relay: + :latest image: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 - uses: docker/setup-buildx-action@v4 diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index af4738e..6a2b7d3 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -19,7 +19,7 @@ concurrency: jobs: tag: - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v7 with: diff --git a/apps/desktop/go.mod b/apps/desktop/go.mod index 9fcf213..25d5b5a 100644 --- a/apps/desktop/go.mod +++ b/apps/desktop/go.mod @@ -18,13 +18,13 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect - github.com/labstack/echo/v4 v4.15.3 // indirect + github.com/labstack/echo/v4 v4.16.3 // indirect github.com/labstack/gommon v0.5.0 // indirect github.com/leaanthony/go-ansi-parser v1.6.1 // indirect github.com/leaanthony/gosod v1.0.4 // indirect github.com/leaanthony/slicer v1.6.0 // indirect github.com/leaanthony/u v1.1.1 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-colorable v0.1.15 // indirect github.com/mattn/go-isatty v0.0.22 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect @@ -36,6 +36,6 @@ require ( github.com/wailsapp/go-webview2 v1.0.22 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect golang.org/x/crypto v0.58.0 // indirect - golang.org/x/net v0.61.0 // indirect + golang.org/x/net v0.62.0 // indirect golang.org/x/text v0.43.0 // indirect ) diff --git a/apps/desktop/go.sum b/apps/desktop/go.sum index 1e16a79..0c39c56 100644 --- a/apps/desktop/go.sum +++ b/apps/desktop/go.sum @@ -16,8 +16,10 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck= github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= -github.com/labstack/echo/v4 v4.15.3 h1:lIdG4kK5RdMyhwCwSc4AmSQsLBb3AVwok6S8PX/9kwQ= -github.com/labstack/echo/v4 v4.15.3/go.mod h1:Xzp1Ns1RA2c9fY7nSgUJkpkUZGNbEIVHZbtbOMPktBI= +github.com/labstack/echo/v4 v4.16.1 h1:h05NuF1GvNu6jSAZxOv++AdjD/NJK+mZdGy0thiiuns= +github.com/labstack/echo/v4 v4.16.1/go.mod h1:V/EQaTVHYJH92QhbQe7kFQ4mjgcjxLQQUQtAN87zZdw= +github.com/labstack/echo/v4 v4.16.3 h1:wAzM49wiBxHpZJQ621lminvdxbwfd1Cn6KwRThKV6nA= +github.com/labstack/echo/v4 v4.16.3/go.mod h1:V/EQaTVHYJH92QhbQe7kFQ4mjgcjxLQQUQtAN87zZdw= github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c= github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0= github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc= @@ -33,8 +35,8 @@ github.com/leaanthony/u v1.1.1/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQc github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= -github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY= +github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= @@ -65,8 +67,8 @@ github.com/wailsapp/wails/v2 v2.16.0/go.mod h1:scxrgwfsv6yR6fE6cCF+Flfl+JeU+SR87 golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw= -golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= +golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY= +golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json index 9ae6c10..98962cf 100644 --- a/apps/mobile/package-lock.json +++ b/apps/mobile/package-lock.json @@ -4390,12 +4390,12 @@ } }, "node_modules/decode-uri-component": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", - "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.5.1.tgz", + "integrity": "sha512-vWHQkXgg2cE3BB4rR0c+PYw9BCQzLoNIRMI7AunIkZst74tw/vpPp7VLoYtsR/cy1f55g3XDWUslfeCZjiZJyA==", "license": "MIT", "engines": { - "node": ">=0.10" + "node": ">=14.16" } }, "node_modules/deep-is": { @@ -6131,34 +6131,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/expo/node_modules/react-native-worklets": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.10.4.tgz", - "integrity": "sha512-gbk0CxMrGywEp3SJAHO+2JVaCWtl4WyAYBIxLZy6Y113+mHHuq3FuT6iV+VcaBuJzuuN34mtdZ4j5JIlBDzmeA==", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/plugin-transform-arrow-functions": "^7.27.1", - "@babel/plugin-transform-class-properties": "^7.28.6", - "@babel/plugin-transform-classes": "^7.28.6", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6", - "@babel/plugin-transform-optional-chaining": "^7.28.6", - "@babel/plugin-transform-shorthand-properties": "^7.27.1", - "@babel/plugin-transform-template-literals": "^7.27.1", - "@babel/plugin-transform-unicode-regex": "^7.27.1", - "@babel/preset-typescript": "^7.28.5", - "@babel/types": "^7.27.1", - "convert-source-map": "^2.0.0", - "semver": "^7.7.4" - }, - "peerDependencies": { - "@babel/core": "*", - "@react-native/metro-config": "*", - "react": "*", - "react-native": "0.83 - 0.86" - } - }, "node_modules/expo/node_modules/ws": { "version": "8.22.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz", @@ -8533,9 +8505,9 @@ } }, "node_modules/node-forge": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz", - "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.3.tgz", + "integrity": "sha512-P6wzfh6t70avmV8FrVEAd/36sOPJQ+hkaJVX1Laap9J/77m7M0eyozDvc8SwnDf4P7MP94gwbAAo0rg3YVXT+g==", "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 3dfe7d2..4efdba5 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -37,5 +37,9 @@ "lint": "expo lint", "bundle": "npm run build:bundle --prefix ../web" }, - "private": true + "private": true, + "overrides": { + "decode-uri-component": "^0.5.1", + "node-forge": "^1.4.1" + } } diff --git a/apps/web/package.json b/apps/web/package.json index 0593367..a38d76b 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -17,7 +17,7 @@ "@excalidraw/excalidraw": "0.18.1", "@relay/api-client": "0.0.0", "@solidjs/router": "1.0.0", - "dompurify": "^3.4.16", + "dompurify": "^3.4.17", "marked": "^18.0.13", "react": "19.3.0", "react-dom": "19.3.0", diff --git a/go.mod b/go.mod index aa85534..13f0816 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/pressly/goose/v3 v3.29.0 go.uber.org/zap v1.28.0 golang.org/x/crypto v0.58.0 - golang.org/x/net v0.61.0 + golang.org/x/net v0.62.0 ) require ( diff --git a/go.sum b/go.sum index 5193358..eb3f54f 100644 --- a/go.sum +++ b/go.sum @@ -174,8 +174,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw= -golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= +golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY= +golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/package-lock.json b/package-lock.json index 67efb94..8a95ad3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@excalidraw/excalidraw": "0.18.1", "@relay/api-client": "0.0.0", "@solidjs/router": "1.0.0", - "dompurify": "^3.4.16", + "dompurify": "^3.4.17", "marked": "^18.0.13", "react": "19.3.0", "react-dom": "19.3.0", @@ -5203,9 +5203,9 @@ "license": "MIT" }, "node_modules/dompurify": { - "version": "3.4.16", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.16.tgz", - "integrity": "sha512-sqo+pNp3qRhCIpbgRi1y8Tgk27Bo2Ry7w0dC1NBeNTdZChWjz9Xb/KOoZbRP/R6pQZ80Qw8YhXw13hWWBbMRnQ==", + "version": "3.4.17", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.17.tgz", + "integrity": "sha512-B/pSlYVHQ58kqISD/yDjuJ1yfzI34m1gF4lAod2bwSRhiN4K5Cl3H8Af7hqB2PmTL911tdEudnnXn5FnhRoz0w==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7"