diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 542f61c7..0f9ede9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Deno environment uses: denolib/setup-deno@v1.3.0 with: - deno-version: v1.2.0 + deno-version: v1.2.2 - uses: actions/checkout@v2 @@ -30,10 +30,10 @@ jobs: - name: Compile API endpoints run: | - deno cache --unstable --importmap ./import_map.json ./api/async/publish.ts - deno cache --unstable --importmap ./import_map.json ./api/builds/get.ts - deno cache --unstable --importmap ./import_map.json ./api/modules/list.ts - deno cache --unstable --importmap ./import_map.json ./api/webhook/github.ts + deno cache --unstable ./api/async/publish.ts + deno cache --unstable ./api/builds/get.ts + deno cache --unstable ./api/modules/list.ts + deno cache --unstable ./api/webhook/github.ts - name: Build run: sam build diff --git a/API.md b/API.md index 7e5b0c3a..b364b17e 100644 --- a/API.md +++ b/API.md @@ -11,7 +11,7 @@ The contents and headers should be a GitHub `create` webhook event. More informa There are some query parameters that change the request: - `subdir`: this specifies a subdirectory of the repository to upload (not set by default). This directory must be in the format `std/`. -- `version_prefix`: only upload versions that match this prefix. When this is set to `std/` and you tag version `std/0.61.0`, version `0.61.0` will be uploaded. +- `version_prefix`: only upload versions that match this prefix. When this is set to `std/` and you tag version `std/0.63.0`, version `0.63.0` will be uploaded. ### Response diff --git a/Dockerfile b/Dockerfile index 1806ef85..5cc3280e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,10 @@ RUN pip install awscli WORKDIR /app -COPY import_map.json . COPY deps.ts . -RUN deno cache --unstable --importmap import_map.json deps.ts +RUN deno cache --unstable deps.ts COPY test_deps.ts . -RUN deno cache --unstable --importmap import_map.json test_deps.ts +RUN deno cache --unstable test_deps.ts ADD . . diff --git a/Makefile b/Makefile index 6be85260..00789f9f 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,19 @@ build-WebhookGithubFunction: - deno bundle --unstable --importmap ./import_map.json ./api/webhook/github.ts > $(ARTIFACTS_DIR)/bundle.js + deno bundle --unstable ./api/webhook/github.ts > $(ARTIFACTS_DIR)/bundle.js # Cache the mongo plugin - cd $(ARTIFACTS_DIR) && deno run -A --unstable --importmap ../../../import_map.json ../../../deps.ts + cd $(ARTIFACTS_DIR) && deno run -A --unstable ../../../deps.ts build-ModulesListFunction: - deno bundle --unstable --importmap ./import_map.json ./api/modules/list.ts > $(ARTIFACTS_DIR)/bundle.js + deno bundle --unstable ./api/modules/list.ts > $(ARTIFACTS_DIR)/bundle.js # Cache the mongo plugin - cd $(ARTIFACTS_DIR) && deno run -A --unstable --importmap ../../../import_map.json ../../../deps.ts + cd $(ARTIFACTS_DIR) && deno run -A --unstable ../../../deps.ts build-AsyncPublishFunction: - deno bundle --unstable --importmap ./import_map.json ./api/async/publish.ts > $(ARTIFACTS_DIR)/bundle.js + deno bundle --unstable ./api/async/publish.ts > $(ARTIFACTS_DIR)/bundle.js # Cache the mongo plugin - cd $(ARTIFACTS_DIR) && deno run -A --unstable --importmap ../../../import_map.json ../../../deps.ts + cd $(ARTIFACTS_DIR) && deno run -A --unstable ../../../deps.ts build-BuildsGetFunction: - deno bundle --unstable --importmap ./import_map.json ./api/builds/get.ts > $(ARTIFACTS_DIR)/bundle.js + deno bundle --unstable ./api/builds/get.ts > $(ARTIFACTS_DIR)/bundle.js # Cache the mongo plugin - cd $(ARTIFACTS_DIR) && deno run -A --unstable --importmap ../../../import_map.json ../../../deps.ts + cd $(ARTIFACTS_DIR) && deno run -A --unstable ../../../deps.ts diff --git a/deps.ts b/deps.ts index b6be7594..0526fe4c 100644 --- a/deps.ts +++ b/deps.ts @@ -4,11 +4,9 @@ export { expandGlob, walk, readJsonSync, -} from "https://deno.land/std@0.61.0/fs/mod.ts"; -export { join } from "https://deno.land/std@0.61.0/path/mod.ts"; +} from "https://deno.land/std@0.63.0/fs/mod.ts"; +export { join } from "https://deno.land/std@0.63.0/path/mod.ts"; export { S3Bucket } from "https://raw.githubusercontent.com/lucacasonato/deno_s3/fa75e7a745c6856ef03add70a8cb37fb37e818ce/mod.ts"; -export { prettyBytes } from "https://raw.githubusercontent.com/brunnerlivio/deno-pretty-bytes/master/mod.ts"; -export * as YAML from "https://deno.land/std@0.61.0/encoding/yaml.ts"; export type { APIGatewayProxyEventV2, APIGatewayProxyResultV2, @@ -19,6 +17,6 @@ export type { export { MongoClient, ObjectId, -} from "https://raw.githubusercontent.com/lucacasonato/deno_mongo_lambda/3f407a302c883f1a84fc6c4aebf28a45ff3aa49e/mod.ts"; +} from "https://raw.githubusercontent.com/lucacasonato/deno_mongo_lambda/v0.10.0/mod.ts"; export { SQSQueue } from "https://raw.githubusercontent.com/lucacasonato/deno_sqs/6685e2a534122c01e3bfacbe6e590b8e5931633f/mod.ts"; export { lookup } from "https://deno.land/x/media_types@v2.4.3/mod.ts"; diff --git a/import_map.json b/import_map.json deleted file mode 100644 index 54794e04..00000000 --- a/import_map.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "imports": { - "https://deno.land/std@v0.61.0/": "https://deno.land/std@0.61.0/" - } -} diff --git a/run-tests.sh b/run-tests.sh index ff943e34..c2d04fa5 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -18,4 +18,4 @@ export BUILD_QUEUE=http://sqs:9324/000000000000/builds export STORAGE_BUCKET=deno-registry2 export S3_ENDPOINT_URL=http://s3:9000 -deno test --unstable --importmap import_map.json -A \ No newline at end of file +deno test --unstable -A \ No newline at end of file diff --git a/template.yaml b/template.yaml index 23a12acb..947aa919 100644 --- a/template.yaml +++ b/template.yaml @@ -8,7 +8,7 @@ Resources: Properties: Location: ApplicationId: arn:aws:serverlessrepo:us-east-1:390065572566:applications/deno - SemanticVersion: 1.2.1 + SemanticVersion: 1.2.2 DenoHttpApi: Type: AWS::Serverless::HttpApi diff --git a/test_deps.ts b/test_deps.ts index 6cd870f9..a6b686da 100644 --- a/test_deps.ts +++ b/test_deps.ts @@ -4,5 +4,5 @@ export { assert, assertEquals, assertThrows, -} from "https://deno.land/std@0.61.0/testing/asserts.ts"; -export { readJson } from "https://deno.land/std@0.61.0/fs/mod.ts"; +} from "https://deno.land/std@/testing/asserts.ts"; +export { readJson } from "https://deno.land/std@/fs/mod.ts";