diff --git a/.github/workflows/radius-build.yml b/.github/workflows/radius-build.yml index f41ecb60b..5b09bcff8 100644 --- a/.github/workflows/radius-build.yml +++ b/.github/workflows/radius-build.yml @@ -122,6 +122,7 @@ jobs: name: release path: ${{ env.RELEASE_PATH }} if-no-files-found: error + vscode-bicep-build: name: Build Bicep vscode extension runs-on: ubuntu-latest @@ -167,28 +168,13 @@ jobs: - name: Build prod run: npm run build:prod working-directory: ./src/vscode-bicep - - # Comment out while we troubleshoot the root cause of e2e errors - # - name: Build E2E tests - # run: npm run build:e2e - # working-directory: ./src/vscode-bicep - - # - name: Run E2E tests - # run: xvfb-run -a npm run test:e2e - # working-directory: ./src/vscode-bicep - - # - name: Show extension logs of E2E tests - # run: cat ./bicep.log - # if: always() - # working-directory: ./src/vscode-bicep - - name: Create VSIX run: npm run package working-directory: ./src/vscode-bicep - name: Copy VSIX run: > mkdir -p ./artifacts/vscode && - cp ./src/vscode-bicep/vscode-bicep.vsix ./artifacts/vscode/rad-vscode-bicep.vsix + cp ./src/vscode-bicep/rad-vscode-bicep.vsix ./artifacts/vscode/rad-vscode-bicep.vsix - name: Upload artifacts uses: actions/upload-artifact@v3 with: @@ -198,7 +184,7 @@ jobs: - name: Copy VSIX to release run: > mkdir -p ${{ env.RELEASE_PATH }}/vscode && - cp ./src/vscode-bicep/vscode-bicep.vsix ${{ env.RELEASE_PATH }}/rad-vscode-bicep.vsix + cp ./src/vscode-bicep/rad-vscode-bicep.vsix ${{ env.RELEASE_PATH }}/rad-vscode-bicep.vsix - name: Upload VSIX to release uses: actions/upload-artifact@v3 with: @@ -250,7 +236,8 @@ jobs: --title "Radius Bicep v${{ env.REL_VERSION }}" env: GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }} - publish_ghcr: + + publish: if: ${{ github.event_name == 'push' }} name: Publish to GHCR needs: ["build", "vscode-bicep-build"] @@ -299,7 +286,6 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: oras-project/setup-oras@v1 with: version: ${{ env.ORAS_VERSION }} @@ -309,70 +295,11 @@ jobs: cd ./artifacts/bicep/${{ matrix.runtime.name }} && oras push --annotation "org.opencontainers.image.source=${{ env.IMAGE_SRC }}" ${{ env.CONTAINER_REGISTRY }}/bicep/rad-bicep/${{ matrix.runtime.name }}:${{ env.UPDATE_RELEASE == 'true' && env.REL_CHANNEL || 'latest' }} ./rad-bicep${{ matrix.runtime.extension }} - name: Check uploaded run: curl --fail ${{ env.CONTAINER_REGISTRY }}/bicep/rad-bicep/${{ matrix.runtime.name }}:latest -v > out - - # TODO: remove upload to blob storage once binaries are fully moved to GHCR - - uses: bacongobbler/azure-blob-storage-upload@v1.2.0 - name: Upload rad-bicep (${{ matrix.runtime.name }}) - id: upload-rad-bicep - with: - container_name: ${{ secrets.ASSETS_STORAGE_CONTAINER }} - connection_string: ${{ secrets.ASSETS_STORAGE_CONNECTION_STRING }} - source_dir: ./artifacts/bicep/${{ matrix.runtime.name }}/ - extra_args: "--destination-path ./bicep-extensibility/${{ env.REL_CHANNEL }}/${{ matrix.runtime.name }}/ --pattern rad-bicep${{ matrix.runtime.extension }} --overwrite true" - sync: true - - name: Check uploaded - run: curl --fail https://radiuspublic.blob.core.windows.net/tools/bicep-extensibility/${{ env.REL_CHANNEL }}/${{ matrix.runtime.name }}/rad-bicep${{ matrix.runtime.extension }} -v > out - - # Only upload it once - - uses: bacongobbler/azure-blob-storage-upload@v1.2.0 - if: ${{ matrix.runtime.name == 'linux-x64' }} - name: Upload VS Code (channel) - with: - container_name: ${{ secrets.ASSETS_STORAGE_CONTAINER }} - connection_string: ${{ secrets.ASSETS_STORAGE_CONNECTION_STRING }} - source_dir: ./artifacts/vscode/ - extra_args: "--destination-path ./vscode-extensibility/${{ env.REL_CHANNEL }}/ --overwrite true" - sync: true - - # Logic: If this is a real release (tagged, non-rc) then compare to our existing full - # release and see if it's newer. This prevents a patch release of an older vintage from overwriting - # a newer release - - name: Download version marker file - run: | - curl https://radiuspublic.blob.core.windows.net/version/stable.txt -o current-stable.txt - if: ${{ success() && env.UPDATE_RELEASE == 'true' }} - - name: Get version - id: setcurrentversion - if: ${{ success() && env.UPDATE_RELEASE == 'true' }} - run: echo ::set-output name=version::$(cat current-stable.txt) - - name: Compare versions - uses: madhead/semver-utils@latest - if: ${{ success() && env.UPDATE_RELEASE == 'true' }} - id: compare - with: - version: ${{ env.REL_VERSION }} - compare-to: ${{ steps.setcurrentversion.outputs.version }}.0 - - name: Print info (for sanity) - if: ${{ success() && env.UPDATE_RELEASE == 'true' }} - run: | - echo "current stable channel: ${{ steps.setcurrentversion.outputs.version }}" - echo "this build channel: ${{ env.REL_CHANNEL }}" - echo "this build version: ${{ env.REL_VERSION }}" - echo "comparison: ${{ steps.compare.outputs.comparison-result }}" - - uses: bacongobbler/azure-blob-storage-upload@v1.2.0 - name: Upload VS Code (stable) - if: ${{ success() && (steps.compare.outputs.comparison-result == '>' || steps.compare.outputs.comparison-result == '=')}} - with: - container_name: ${{ secrets.ASSETS_STORAGE_CONTAINER }} - connection_string: ${{ secrets.ASSETS_STORAGE_CONNECTION_STRING }} - source_dir: ./artifacts/vscode/ - extra_args: "--destination-path ./vscode-extensibility/stable/ --overwrite true" - sync: true delete_artifacts: name: Delete artifacts if: success() - needs: [ 'publish_ghcr' ] + needs: [ 'publish' ] runs-on: ubuntu-latest steps: - name: Delete release artifacts diff --git a/README.md b/README.md index bdaa74fdc..6f788e653 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ ## 🏗️ UNDER CONSTRUCTION -This is a temporary fork of the official [Azure Bicep](https://github.com/Azure/bicep) to support [Radius](https://github.com/project-radius/radius) while we upstream our extensibility updates to the official Bicep repository. Once that is complete, we will deprecate this repository and users can use the official build of Bicep with Radius. +This is a temporary fork of the official [Azure Bicep](https://github.com/Azure/bicep) to support [Radius](https://github.com/radius-project/radius) while we upstream our extensibility updates to the official Bicep repository. Once that is complete, we will deprecate this repository and users can use the official build of Bicep with Radius. Note that the main Bicep VSCode extension is not compatible with rad-bicep and must be disabled. There may also be small inconsistencies between the main Bicep release and rad-bicep until we complete the full extensibility experience. -For more information please visit https://docs.radapp.dev +For more information please visit https://docs.radapp.io ## FAQ **What unique benefits do you get with Radius Bicep?** 1. Tooling to author and deploy Radius resources. Radius resources are application-centric and platform-agnostic, allowing apps to be written once and deployed to multiple platforms (_on-premises, Azure, AWS, etc._). -1. Tooling to author and deploy AWS resource types using the [AWS extensibility provider](https://github.com/project-radius/bicep-types-aws) +1. Tooling to author and deploy AWS resource types using the [AWS extensibility provider](https://github.com/radius-project/bicep-types-aws) **Can you install both the official Bicep CLI and the Radius (rad) CLI?** diff --git a/src/Bicep.Cli.Nuget/Package.nuspec b/src/Bicep.Cli.Nuget/Package.nuspec index 4e71a8ec8..109c8fa10 100644 --- a/src/Bicep.Cli.Nuget/Package.nuspec +++ b/src/Bicep.Cli.Nuget/Package.nuspec @@ -6,14 +6,14 @@ Microsoft MIT https://licenses.nuget.org/MIT - bicep-logo-256.png + rad-vscode-bicep-logo.png https://github.com/Azure/bicep Bicep Command Line Interface tool © Microsoft Corporation. All rights reserved. Azure Bicep CLI compiler - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index d5319ac1d..63a50d6a3 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -33,7 +33,7 @@ © Microsoft Corporation. All rights reserved. Azure;Bicep;$(PackageTags) - bicep-logo-256.png + rad-vscode-bicep-logo.png true @@ -47,7 +47,7 @@ - + diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj index ca89b1eb9..cee650c17 100644 --- a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj +++ b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj @@ -88,7 +88,7 @@ - + true Always diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/source.extension.vsixmanifest b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/source.extension.vsixmanifest index 2d581d6d0..c69c26a96 100644 --- a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/source.extension.vsixmanifest +++ b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/source.extension.vsixmanifest @@ -5,7 +5,7 @@ Bicep for Visual Studio Bicep language support for Visual Studio. License.txt - Icons\bicep-logo-256.png + Icons\rad-vscode-bicep-logo.png diff --git a/src/vscode-bicep/README.md b/src/vscode-bicep/README.md index cf709777b..10862704d 100644 --- a/src/vscode-bicep/README.md +++ b/src/vscode-bicep/README.md @@ -1,4 +1,12 @@ -# Key features of the Bicep VS Code extension +## 🏗️ UNDER CONSTRUCTION + +This is a temporary fork of the official [Azure Bicep](https://github.com/Azure/bicep) to support [Radius](https://github.com/radius-project/radius) while we upstream our extensibility updates to the official Bicep repository. Once that is complete, we will deprecate this repository and users can use the official build of Bicep with Radius. + +Note that the main Bicep VSCode extension is not compatible with rad-bicep and must be disabled. There may also be small inconsistencies between the main Bicep release and rad-bicep until we complete the full extensibility experience. + +For more information please visit https://docs.radapp.io + +## Key features of the Bicep VS Code extension The [Bicep VS Code extension](https://docs.microsoft.com/azure/azure-resource-manager/bicep/install#vs-code-and-bicep-extension) is capable of many of the features you would expect out of other language tooling. Here is a comprehensive list of the features that are currently implemented. diff --git a/src/vscode-bicep/icons/rad-vscode-bicep-logo.png b/src/vscode-bicep/icons/rad-vscode-bicep-logo.png new file mode 100644 index 000000000..4fccd9286 Binary files /dev/null and b/src/vscode-bicep/icons/rad-vscode-bicep-logo.png differ diff --git a/src/vscode-bicep/package.json b/src/vscode-bicep/package.json index 762fe2de5..eeac31c19 100644 --- a/src/vscode-bicep/package.json +++ b/src/vscode-bicep/package.json @@ -6,7 +6,7 @@ "license": "MIT", "version": "0.0.0-placeholder", "publisher": "ms-azuretools", - "icon": "icons/bicep-logo-256.png", + "icon": "icons/rad-vscode-bicep-logo.png", "preview": false, "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { @@ -17,23 +17,24 @@ "Programming Languages" ], "keywords": [ + "Radius", "Bicep", "Azure Resource Manager", "ARM Template", "Azure" ], "bugs": { - "url": "https://github.com/Azure/bicep/issues" + "url": "https://github.com/radius-project/bicep/issues" }, "repository": { "type": "git", - "url": "https://github.com/Azure/bicep" + "url": "https://github.com/radius-project/bicep" }, "galleryBanner": { "color": "E7F1FA", "theme": "light" }, - "homepage": "https://github.com/Azure/bicep/blob/main/README.md", + "homepage": "https://github.com/radius-project/bicep/blob/main/README.md", "activationEvents": [ "onLanguage:bicep", "onCommand:bicep.build", @@ -535,7 +536,7 @@ "test:update-snapshot": "jest --config jest.config.snapshot.js --updateSnapshot", "testlocal:e2e": "(export BICEP_LANGUAGE_SERVER_PATH=${INIT_CWD}/../Bicep.LangServer/bin/Debug/net6.0/Bicep.LangServer.dll || set BICEP_LANGUAGE_SERVER_PATH=%INIT_CWD%/../Bicep.LangServer/bin/Debug/net6.0/Bicep.LangServer.dll) && npm run build && npm run build:e2e && npm run test:e2e", "clean": "rimraf ./out ./coverage", - "package": "npm run clean && nbgv-setversion && vsce package --githubBranch main --out ./vscode-bicep.vsix && nbgv-setversion --reset", + "package": "npm run clean && nbgv-setversion && vsce package --githubBranch bicep-extensibility --out ./rad-vscode-bicep.vsix && nbgv-setversion --reset", "packagelocal": "rimraf ./bicepLanguageServer && cp -r ../Bicep.LangServer/bin/Debug/net6.0 ./bicepLanguageServer && npm run package", "params": "node ./enableParams.js" }, diff --git a/version.json b/version.json index f166770ba..2631f9a65 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,10 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.11", + "version": "0.0.0", "cloudBuild": { "setVersionVariables": false - } + }, + "publicReleaseRefSpec": [ + "^refs/tags/v\\d+\\.\\d+.\\d+" + ] }