Skip to content

Commit

Permalink
Merge pull request #1204 from posit-dev/dotnomad/package-to-dist
Browse files Browse the repository at this point in the history
Move vsix package directory from `/packages` to `/dist`
  • Loading branch information
dotNomad authored Mar 27, 2024
2 parents 7459e6a + 3cb039e commit cb90854
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ jobs:
- uses: actions/upload-artifact@v4
id: upload
with:
name: packages
path: packages/**/*
name: dist
path: dist/**/*
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,4 +46,4 @@ jobs:
prerelease: ${{ steps.get-prerelease.outputs.prerelease == 'true' }}
files: |
archives/**/*
packages/**/*
dist/**/*
4 changes: 2 additions & 2 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cover.out
archives/
bin/
certs/
packages/
dist/

.DS_Store

Expand Down
4 changes: 2 additions & 2 deletions extensions/vscode/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/get-vscode-extension-path.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit cb90854

Please sign in to comment.