Skip to content

Commit e88487c

Browse files
committed
Merge branch 'main' of https://github.com/metatypedev/metatype into MET-432--Uploading-PythonRuntime-files-
2 parents b29845d + 2a176ee commit e88487c

File tree

44 files changed

+1820
-393
lines changed

Some content is hidden

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

44 files changed

+1820
-393
lines changed

.github/workflows/tests.yml

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
pnpm install --frozen-lockfile --recursive
8484
cd ..
8585
deno cache --import-map typegate/import_map.json typegate/src/main.ts typegate/tests/utils/mod.ts
86-
- uses: pre-commit/[email protected].0
86+
- uses: pre-commit/[email protected].1
8787

8888
test-website:
8989
needs: changes
@@ -175,59 +175,58 @@ jobs:
175175
cargo run --locked --package meta-cli -- --help
176176
cargo test --locked --package meta-cli
177177
178-
test-docker:
179-
needs: changes
180-
if: ${{ needs.changes.outputs.typegate == 'true' }}
181-
runs-on: ${{ matrix.runner }}
182-
strategy:
183-
fail-fast: false
184-
matrix:
185-
include:
186-
- platform: linux/amd64
187-
runner: ubuntu-latest
188-
# - platform: linux/amd64
189-
# runner: custom-ubuntu-large
190-
# FIXME: try macos-14 runner once all actions support it
191-
# docker buildx action broken as of 2024-02-09
192-
193-
# TODO
194-
# - platform: linux/arm64
195-
# runner: custom-macos
196-
steps:
197-
- uses: actions/checkout@v4
198-
- uses: docker/setup-buildx-action@v3
199-
- uses: scherermichael-oss/action-has-permission@master
200-
id: check
201-
with:
202-
required-permission: write
203-
env:
204-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
205-
- uses: docker/login-action@v3
206-
if: steps.check.outputs.has-permission
207-
with:
208-
registry: docker.io
209-
username: zifeo
210-
password: ${{ secrets.DOCKERHUB_TOKEN }}
211-
- name: Build with cache (internal)
212-
uses: docker/build-push-action@v5
213-
if: steps.check.outputs.has-permission
214-
with:
215-
file: dev/Dockerfile
216-
platforms: ${{ matrix.platform }}
217-
push: false
218-
cache-from: type=registry,ref=docker.io/zifeo/metatype-cache:ci
219-
cache-to: type=registry,ref=docker.io/zifeo/metatype-cache:ci,mode=max
220-
# check target runs extra validation steps in the Dockerfile
221-
target: check
222-
- name: Build without cache (external)
223-
uses: docker/build-push-action@v5
224-
if: "! steps.check.outputs.has-permission"
225-
with:
226-
file: dev/Dockerfile
227-
platforms: linux/amd64
228-
push: false
229-
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/typegate:latest
230-
target: check
178+
# test-docker:
179+
# needs: changes
180+
# if: ${{ needs.changes.outputs.typegate == 'true' }}
181+
# runs-on: ${{ matrix.runner }}
182+
# strategy:
183+
# fail-fast: false
184+
# matrix:
185+
# include:
186+
# - platform: linux/amd64
187+
# runner: ubuntu-latest
188+
# # - platform: linux/amd64
189+
# # runner: custom-ubuntu-large
190+
# # FIXME: try macos-14 runner once all actions support it
191+
# # docker buildx action broken as of 2024-02-09
192+
# # TODO
193+
# # - platform: linux/arm64
194+
# # runner: custom-macos
195+
# steps:
196+
# - uses: actions/checkout@v4
197+
# - uses: docker/setup-buildx-action@v3
198+
# - uses: scherermichael-oss/action-has-permission@master
199+
# id: check
200+
# with:
201+
# required-permission: write
202+
# env:
203+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
204+
# - uses: docker/login-action@v3
205+
# if: steps.check.outputs.has-permission
206+
# with:
207+
# registry: docker.io
208+
# username: zifeo
209+
# password: ${{ secrets.DOCKERHUB_TOKEN }}
210+
# - name: Build with cache (internal)
211+
# uses: docker/build-push-action@v5
212+
# if: steps.check.outputs.has-permission
213+
# with:
214+
# file: dev/Dockerfile
215+
# platforms: ${{ matrix.platform }}
216+
# push: false
217+
# cache-from: type=registry,ref=docker.io/zifeo/metatype-cache:ci
218+
# cache-to: type=registry,ref=docker.io/zifeo/metatype-cache:ci,mode=max
219+
# # check target runs extra validation steps in the Dockerfile
220+
# target: check
221+
# - name: Build without cache (external)
222+
# uses: docker/build-push-action@v5
223+
# if: "! steps.check.outputs.has-permission"
224+
# with:
225+
# file: dev/Dockerfile
226+
# platforms: linux/amd64
227+
# push: false
228+
# cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/typegate:latest
229+
# target: check
231230

232231
test-full:
233232
needs: changes
@@ -244,7 +243,7 @@ jobs:
244243
ports:
245244
- 6379:6379
246245
options: >-
247-
--health-cmd "redis-cli ping"
246+
--health-cmd "redis-cli -a password ping"
248247
--health-interval 10s
249248
--health-timeout 5s
250249
--health-retries 5

dev/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ const env: Record<string, string> = {
100100
"TG_SECRET":
101101
"a4lNi0PbEItlFZbus1oeH/+wyIxi9uH6TpL8AIqIaMBNvp7SESmuUBbfUwC0prxhGhZqHw8vMDYZAGMhSZ4fLw==",
102102
"TG_ADMIN_PASSWORD": "password",
103-
"REDIS_URL": "redis://:password@localhost:6379/0",
104103
"DENO_TESTING": "true",
105104
"TMP_DIR": tmpDir,
106105
"TIMER_MAX_TIMEOUT_MS": "30000",

0 commit comments

Comments
 (0)