diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 46ddb2616..a156138dc 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -18,5 +18,5 @@ jobs: - uses: actions/upload-artifact@v4 id: upload with: - name: packages - path: packages/**/* + name: dist + path: dist/**/* diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eddd76947..5d721a4fd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,8 +36,8 @@ jobs: path: archives - uses: actions/download-artifact@v4 with: - name: packages - path: packages + name: dist + path: dist - id: get-prerelease run: echo "prerelease=$(just pre-release)" >> "$GITHUB_OUTPUT" - uses: softprops/action-gh-release@v1 @@ -46,4 +46,4 @@ jobs: prerelease: ${{ steps.get-prerelease.outputs.prerelease == 'true' }} files: | archives/**/* - packages/**/* + dist/**/* diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 6d7d8de05..3bfb245ae 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -24,8 +24,8 @@ jobs: path: archives - uses: actions/download-artifact@v4 with: - name: packages - path: packages + name: dist + path: dist - uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-east-1 diff --git a/.gitignore b/.gitignore index a6f9ec512..53537d82b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ cover.out archives/ bin/ certs/ -packages/ +dist/ .DS_Store diff --git a/extensions/vscode/CONTRIBUTING.md b/extensions/vscode/CONTRIBUTING.md index 87dd730b8..af0c3059a 100644 --- a/extensions/vscode/CONTRIBUTING.md +++ b/extensions/vscode/CONTRIBUTING.md @@ -59,9 +59,9 @@ When testing, utilize the sample projects in `../../test/sample-content`. Open t ### Packaging -This project uses [`@vscode/vsce`](https://github.com/microsoft/vscode-vsce) to build packages. +This project uses [`@vscode/vsce`](https://github.com/microsoft/vscode-vsce) to build extension packages. -Run the following command to build a new package. The package is output to the `../../packages` directory. +Run the following command to build a new package. The package is output to the `../../dist` directory. ```console just package diff --git a/extensions/vscode/justfile b/extensions/vscode/justfile index 7b798a844..7fdd3bf23 100644 --- a/extensions/vscode/justfile +++ b/extensions/vscode/justfile @@ -159,7 +159,7 @@ package-path: set -eou pipefail {{ _with_debug }} - echo $(readlink -f ../../)/packages + echo $(readlink -f ../../)/dist package-target-platform os="$(just ../../os)" arch="$(just ../../arch)": #!/usr/bin/env bash diff --git a/justfile b/justfile index a75a76c01..3b7d20e0b 100644 --- a/justfile +++ b/justfile @@ -115,7 +115,7 @@ clean: rm -rf ./archives rm -rf ./bin - rm -rf ./packages + rm -rf ./dist # Prints shell commands to configure executable on path. Configure your shell via: eval "$(just configure)" configure: diff --git a/scripts/get-vscode-extension-path.bash b/scripts/get-vscode-extension-path.bash index 960224d8e..3567e0ab6 100755 --- a/scripts/get-vscode-extension-path.bash +++ b/scripts/get-vscode-extension-path.bash @@ -17,4 +17,4 @@ arch=$4 name=$(basename "$cmd") -echo "$(pwd)/packages/$name-$version-$os-$arch.vsix" +echo "$(pwd)/dist/$name-$version-$os-$arch.vsix"