From c1274bdb9e37b64efbb407afe8354a41e065bae8 Mon Sep 17 00:00:00 2001 From: Lionel Henry Date: Fri, 17 Jan 2025 18:50:02 +0100 Subject: [PATCH] Release 1.0.0 (#179) Co-authored-by: Davis Vaughan --- .github/workflows/release-vscode.yml | 31 ++++++++++++++-------------- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- crates/air/Cargo.toml | 2 +- docs-old/release.md | 12 +++++++++-- editors/code/CHANGELOG.md | 11 +++++----- editors/code/package.json | 6 +++--- 7 files changed, 43 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release-vscode.yml b/.github/workflows/release-vscode.yml index c79e8408..ea934acc 100644 --- a/.github/workflows/release-vscode.yml +++ b/.github/workflows/release-vscode.yml @@ -15,15 +15,15 @@ jobs: - os: windows-latest target: x86_64-pc-windows-msvc code-target: win32-x64 - # - os: windows-latest - # target: aarch64-pc-windows-msvc - # code-target: win32-arm64 - # - os: ubuntu-20.04 - # target: x86_64-unknown-linux-gnu - # code-target: linux-x64 - # - os: ubuntu-20.04 - # target: aarch64-unknown-linux-gnu - # code-target: linux-arm64 + # - os: windows-latest + # target: aarch64-pc-windows-msvc + # code-target: win32-arm64 + # - os: ubuntu-20.04 + # target: x86_64-unknown-linux-gnu + # code-target: linux-x64 + # - os: ubuntu-20.04 + # target: aarch64-unknown-linux-gnu + # code-target: linux-arm64 arch: aarch64 - os: macos-latest target: x86_64-apple-darwin @@ -115,15 +115,16 @@ jobs: # path: dist - run: ls -al ./dist - # # Publish to the Code Marketplace. - # - name: Publish Extension (Code Marketplace, release) - # run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/air-*.vsix + # Publish to the Code Marketplace. + - name: Publish Extension (Code Marketplace, release) + run: npx vsce publish --pat ${{ secrets.VSCE_PAT }} --packagePath ./dist/air-*.vsix # Publish the built extension to OpenVSX publish-openvsx: name: "Publish (OpenVSX)" needs: ["build"] runs-on: ubuntu-latest + environment: release steps: - name: Install Nodejs uses: actions/setup-node@v4 @@ -157,6 +158,6 @@ jobs: # path: dist - run: ls -al ./dist - # # Publish to OpenVSX. - # - name: Publish Extension (OpenVSX, release) - # run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ./dist/air-*.vsix + # Publish to OpenVSX. + - name: Publish Extension (OpenVSX, release) + run: npx ovsx publish --pat ${{ secrets.OPEN_VSX_TOKEN }} --packagePath ./dist/air-*.vsix diff --git a/CHANGELOG.md b/CHANGELOG.md index 798b1604..8bd4d417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # Development version +# 1.0.0 + +- Initial public release, yay! + +- Added a synchronization mechanism between IDE and Air settings. See documentation for more information https://posit-dev.github.io/air/configuration.html#settings-synchronization. + - Renamed `ignore-magic-line-break` to `persistent-line-breaks` (#177). - In the CLI, errors and warnings are now written to stderr. This allows you to diff --git a/Cargo.lock b/Cargo.lock index c8a708b2..353dbc7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "air" -version = "0.1.2" +version = "1.0.0" dependencies = [ "air_r_formatter", "air_r_parser", diff --git a/crates/air/Cargo.toml b/crates/air/Cargo.toml index cfbfec9c..3a412221 100644 --- a/crates/air/Cargo.toml +++ b/crates/air/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "air" -version = "0.1.2" +version = "1.0.0" publish = true authors.workspace = true categories.workspace = true diff --git a/docs-old/release.md b/docs-old/release.md index 2ffc8de7..5f73dee7 100644 --- a/docs-old/release.md +++ b/docs-old/release.md @@ -1,15 +1,19 @@ # CLI -The release process of the air cli has some manual steps. When you want to cut a release: +The release process of the air cli has some manual steps. One complication is that for each release of the CLI binary, we create a new release of the extension as this is our primary way of distributing Air. + +When you want to cut a release: - Create a release branch - - Polish `CHANGELOG.md`, bump the version and add a new `Development version` header. + - Polish `CHANGELOG.md`, bump the version and add a new `Development version` header (yep, right away - `cargo dist` is smart enough to ignore this header). - In `crates/air/Cargo.toml`, bump the version. - Run `cargo check` to sync `Cargo.lock`. + - In `editors/code/package.json`, bump the minor version to the next even number for standard releases, or to the next odd number for odd releases. + - Do a PR and merge the release branch. - Manually run the [release workflow](https://github.com/posit-dev/air/actions/workflows/release.yml) @@ -26,4 +30,8 @@ The release process of the air cli has some manual steps. When you want to cut a - Attach the binaries and scripts to that GitHub Release as artifacts. +- Manually run the [extension release workflow](https://github.com/posit-dev/air/actions/workflows/release-vscode.yml) + + It runs on `workflow_dispatch`, and automatically pulls in the latest release binary of Air from the binary release workflow above. + There is no need to bump to an intermediate "dev version" after a release. diff --git a/editors/code/CHANGELOG.md b/editors/code/CHANGELOG.md index 07c0279e..89db6098 100644 --- a/editors/code/CHANGELOG.md +++ b/editors/code/CHANGELOG.md @@ -1,9 +1,10 @@ -# Change Log +# Changelog -All notable changes to the "air" extension will be documented in this file. +- The CLI version and the extension versions are only kept in sync with their major component (the first number). -Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. +- Regarding minor versions (the second number), odd numbers indicate a pre-release of the extension. Even numbers are for public-facing releases. -## [Unreleased] -- Initial release \ No newline at end of file +## 1.0.0 + +- Initial release diff --git a/editors/code/package.json b/editors/code/package.json index 20c08576..e8e495bf 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1,8 +1,8 @@ { - "name": "air", - "displayName": "Air", + "name": "air-vscode", + "displayName": "Air - R Language Support", "description": "R formatter and language server", - "version": "0.0.1", + "version": "1.0.1", "publisher": "Posit", "license": "MIT", "homepage": "https://posit-dev.github.io/air",