Skip to content

Commit

Permalink
Merge branch 'github:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tjx666 authored Oct 3, 2024
2 parents 572f8da + 44facd0 commit d0c1d41
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 69 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,20 +147,3 @@ jobs:
pat: ${{ secrets.PUBLISHER_KEY }}
registryUrl: https://marketplace.visualstudio.com
extensionFile: ./vscode-github-actions-${{ needs.release.outputs.version }}.vsix

open-vsx-publish:
name: Publish to Open VSX Registry
needs: release
environment: publish-open-vsx
runs-on: ubuntu-latest
env:
OPEN_VSX_TOKEN: ${{ secrets.OPEN_VSX_TOKEN }}
steps:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: vscode-github-actions-${{ needs.release.outputs.version }}.vsix

- name: Publish to Registry
run: |
npx ovsx publish -p $OPEN_VSX_TOKEN *.vsix
102 changes: 52 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/github/vscode-github-actions"
},
"description": "GitHub Actions workflows and runs for github.com hosted repositories in VS Code",
"version": "0.26.4",
"version": "0.27.0",
"engines": {
"vscode": "^1.72.0",
"node": ">= 16"
Expand Down Expand Up @@ -568,6 +568,7 @@
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"dayjs": "^1.11.7",
"elliptic": "6.5.7",
"libsodium-wrappers": "^0.7.10",
"path-browserify": "^1.0.1",
"ssh-config": "^3.0.0",
Expand All @@ -577,5 +578,13 @@
"util": "^0.12.1",
"uuid": "^3.3.3",
"vscode-languageclient": "^8.0.2"
},
"overrides": {
"browserify-sign": {
"elliptic": "6.5.7"
},
"create-ecdh": {
"elliptic": "6.5.7"
}
}
}
10 changes: 9 additions & 1 deletion src/configuration/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,15 @@ export function useEnterprise(): boolean {
export function getGitHubApiUri(): string {
if (!useEnterprise()) return DEFAULT_GITHUB_API;
const base = getConfiguration().get<string>("github-enterprise.uri", DEFAULT_GITHUB_API).replace(/\/$/, "");
return base === DEFAULT_GITHUB_API ? base : `${base}/api/v3`;
if (base === DEFAULT_GITHUB_API) {
return base;
}

if (base.endsWith(".ghe.com")) {
return `api.${base}`;
} else {
return `${base}/api/v3`;
}
}

async function updateLanguageServerApiUrl(context: vscode.ExtensionContext) {
Expand Down

0 comments on commit d0c1d41

Please sign in to comment.