From a1b201ff88862afbf8c5fbe81366fbfca2350f97 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Sun, 25 Aug 2024 13:33:23 +0900 Subject: [PATCH] Prepare 1.20.1 (#1577) * Prepare 1.20.1 Signed-off-by: Sora Morimoto * Generate artifact attestation Signed-off-by: Sora Morimoto * Fix package script Signed-off-by: Sora Morimoto --------- Signed-off-by: Sora Morimoto --- .github/workflows/main.yml | 16 +++++++++++----- .github/workflows/opam-dependency-submission.yml | 13 +++---------- .vscodeignore | 11 ----------- CHANGELOG.md | 5 +++++ package.json | 15 ++++++++++++--- 5 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 .vscodeignore diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8d808e139..1e361484a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,8 +18,14 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'pull_request' || github.sha }} cancel-in-progress: true +permissions: read-all + jobs: build: + permissions: + attestations: write + contents: read + id-token: write runs-on: ubuntu-latest steps: - name: Checkout tree @@ -54,6 +60,11 @@ jobs: if: runner.os == 'Linux' run: yarn package + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v1 + with: + subject-path: ocaml-platform.vsix + - name: Upload artifact if: runner.os == 'Linux' uses: actions/upload-artifact@v4 @@ -96,24 +107,19 @@ jobs: steps: - name: Checkout tree uses: actions/checkout@v4 - - name: Set-up OCaml uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4 - - uses: ocaml/setup-ocaml/lint-opam@v3 lint-fmt: runs-on: ubuntu-latest - steps: - name: Checkout tree uses: actions/checkout@v4 - - name: Set-up OCaml uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4 - - uses: ocaml/setup-ocaml/lint-fmt@v3 diff --git a/.github/workflows/opam-dependency-submission.yml b/.github/workflows/opam-dependency-submission.yml index 88a9d45b9..6b52df233 100644 --- a/.github/workflows/opam-dependency-submission.yml +++ b/.github/workflows/opam-dependency-submission.yml @@ -13,21 +13,14 @@ permissions: read-all jobs: opam-dependency-submission: - name: Opam Dependency Submission - permissions: contents: write - runs-on: ubuntu-latest - steps: - name: Checkout tree uses: actions/checkout@v4 - - - name: Set-up OCaml 4.14 + - name: Set-up OCaml uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: "4.14" - - - name: Opam Dependency Submission - uses: ocaml/setup-ocaml/analysis@v3 + ocaml-compiler: 4 + - uses: ocaml/setup-ocaml/analysis@v3 diff --git a/.vscodeignore b/.vscodeignore deleted file mode 100644 index 15ff79f09..000000000 --- a/.vscodeignore +++ /dev/null @@ -1,11 +0,0 @@ -** -!assets/ -!dist/ -!languages/ -!snippets/ -!syntaxes/ -!README.md -!CHANGELOG.md -!LICENSE -!package.json -!astexplorer/dist/index.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 22429b369..d57ea9e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ # Unreleased +## 1.20.1 + +- This was a version bump only, there were no changes + - Update runtime dependencies + ## 1.20.0 - Fix syntax for `dune-project.package.(depends|conflicts|depopts)` (#1543) diff --git a/package.json b/package.json index 7150175ad..64c555b10 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocaml-platform", "displayName": "OCaml Platform", - "version": "1.20.0", + "version": "1.20.1", "private": true, "description": "Official OCaml language extension for VSCode", "categories": [ @@ -14,13 +14,22 @@ }, "repository": { "type": "git", - "url": "https://github.com/ocamllabs/vscode-ocaml-platform" + "url": "git+https://github.com/ocamllabs/vscode-ocaml-platform.git" }, "license": "MIT", "publisher": "ocamllabs", "sideEffects": false, "type": "commonjs", "main": "./dist/vscode_ocaml_platform.bc.js", + "files": [ + "assets", + "astexplorer/dist", + "dist", + "languages", + "LICENSE", + "snippets", + "syntaxes" + ], "workspaces": [ "astexplorer" ], @@ -29,7 +38,7 @@ "test:esy": "node ./tests/runEsyTests.js", "test:opam": "node ./tests/runOpamTests.js", "test": "npm-run-all -s test:basic test:opam", - "package": "vsce package --out ocaml-platform.vsix --no-dependencies", + "package": "vsce package --out ocaml-platform.vsix --no-dependencies --allow-unused-files-pattern", "deploy:vsce": "vsce publish --packagePath ocaml-platform.vsix --no-dependencies", "deploy:ovsx": "ovsx publish --packagePath ocaml-platform.vsix --no-dependencies", "check": "biome check",