Skip to content

Commit b43193c

Browse files
Change official builds to use platform-specific VSIXs (#4852)
This PR hopefully completes the work to switch to platform-specific VSIXs. This renames the gulp tasks to give better names and changes the official builds to use the new tasks.
1 parent 7157bbc commit b43193c

File tree

5 files changed

+68
-9
lines changed

5 files changed

+68
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
- name: Compile
3636
run: npm run compile
3737

38-
- name: Build extension package
39-
run: gulp 'vsix:release:package'
38+
- name: Build platform-neutral extension package
39+
run: gulp 'vsix:release:package:platform-neutral'
4040

4141
- name: Run unit and integration tests
4242
run: |
@@ -45,3 +45,6 @@ jobs:
4545
env:
4646
CODE_VERSION: 1.45.0
4747
DISPLAY: :99.0
48+
49+
- name: Build platform-specific extension package
50+
run: gulp 'vsix:release:package:platform-specific'

.github/workflows/release-ci.yml

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,76 @@ jobs:
2222
npm i -g gulp
2323
2424
- name: Build extension package
25-
run: gulp 'vsix:release:package'
25+
run: gulp 'vsix:release:package:platform-specific'
2626

2727
- name: Run release tests
2828
run: npm run test:release
2929

3030
- name: Get package version
3131
run: node -e "console.log('VERSION=' + require('./package.json').version)" >> $GITHUB_ENV
3232

33-
- name: Upload release build
33+
- name: Upload release build (darwin-arm64)
3434
id: upload-release-asset
3535
uses: actions/upload-release-asset@v1
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838
with:
3939
upload_url: ${{ github.event.release.upload_url }}
40-
asset_path: ./csharp-${{ env.VERSION }}.vsix
41-
asset_name: csharp-${{ env.VERSION }}.vsix
40+
asset_path: ./csharp-${{ env.VERSION }}-(darwin-arm64).vsix
41+
asset_name: csharp-${{ env.VERSION }}-(darwin-arm64).vsix
42+
asset_content_type: application/zip
43+
44+
- name: Upload release build (darwin-x64)
45+
id: upload-release-asset
46+
uses: actions/upload-release-asset@v1
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
with:
50+
upload_url: ${{ github.event.release.upload_url }}
51+
asset_path: ./csharp-${{ env.VERSION }}-(darwin-x64).vsix
52+
asset_name: csharp-${{ env.VERSION }}-(darwin-x64).vsix
53+
asset_content_type: application/zip
54+
55+
- name: Upload release build (linux-x64)
56+
id: upload-release-asset
57+
uses: actions/upload-release-asset@v1
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
with:
61+
upload_url: ${{ github.event.release.upload_url }}
62+
asset_path: ./csharp-${{ env.VERSION }}-(linux-x64).vsix
63+
asset_name: csharp-${{ env.VERSION }}-(linux-x64).vsix
64+
asset_content_type: application/zip
65+
66+
- name: Upload release build (win32-arm64)
67+
id: upload-release-asset
68+
uses: actions/upload-release-asset@v1
69+
env:
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
with:
72+
upload_url: ${{ github.event.release.upload_url }}
73+
asset_path: ./csharp-${{ env.VERSION }}-(win32-arm64).vsix
74+
asset_name: csharp-${{ env.VERSION }}-(win32-arm64).vsix
75+
asset_content_type: application/zip
76+
77+
- name: Upload release build (win32-ia32)
78+
id: upload-release-asset
79+
uses: actions/upload-release-asset@v1
80+
env:
81+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
with:
83+
upload_url: ${{ github.event.release.upload_url }}
84+
asset_path: ./csharp-${{ env.VERSION }}-(win32-ia32).vsix
85+
asset_name: csharp-${{ env.VERSION }}-(win32-ia32).vsix
86+
asset_content_type: application/zip
87+
88+
- name: Upload release build (win32-x64)
89+
id: upload-release-asset
90+
uses: actions/upload-release-asset@v1
91+
env:
92+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
93+
with:
94+
upload_url: ${{ github.event.release.upload_url }}
95+
asset_path: ./csharp-${{ env.VERSION }}-(win32-x64).vsix
96+
asset_name: csharp-${{ env.VERSION }}-(win32-x64).vsix
4297
asset_content_type: application/zip

tasks/backcompatTasks.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
import * as gulp from 'gulp';
77

8-
gulp.task('package:offline', gulp.series('vsix:offline:package'));
8+
gulp.task('package:offline', gulp.series('vsix:release:package:platform-specific'));
9+
gulp.task('vsix:offline:package', gulp.series('vsix:release:package:platform-specific'));

tasks/offlinePackagingTasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function getPackageName(packageJSON: any, vscodePlatformId: string) {
3838
return `${name}.${version}-${vscodePlatformId}.vsix`;
3939
}
4040

41-
gulp.task('vsix:offline:package', async () => {
41+
gulp.task('vsix:release:package:platform-specific', async () => {
4242

4343
if (process.platform === 'win32') {
4444
throw new Error('Do not build offline packages on windows. Runtime executables will not be marked executable in *nix packages.');

tasks/onlinePackagingTasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ gulp.task('vsix:release:unpackage', () => {
2121
return fs.createReadStream(packageName).pipe(Extract({ path: unpackedVsixPath }));
2222
});
2323

24-
gulp.task('vsix:release:package', async (onError) => {
24+
gulp.task('vsix:release:package:platform-neutral', async (onError) => {
2525
del.sync(vscodeignorePath);
2626

2727
fs.copyFileSync(onlineVscodeignorePath, vscodeignorePath);

0 commit comments

Comments
 (0)