➕ 将bundle作为压缩包保存

Author: xsro

.github/workflows/ci.yml

@@ -18,17 +18,11 @@ jobs:
  with:
  node-version: '12.x'
 
- - name: create jsdos bundles
- working-directory: ./bundles
- run: |
- yarn
- yarn build
-
  - name: build react app
  working-directory: ./react-app
  run: |
- yarn
- yarn build
+ pnpm i
+ pnpm build
 
  - name: Deploy
  uses: peaceiris/actions-gh-pages@v3

.github/workflows/gh-pages.yml .github/workflows/react.yml.github/workflows/gh-pages.yml renamed to .github/workflows/react.yml

@@ -1,4 +1,4 @@
-name: CI
+name: vscode extension
 on:
  push:
  branches:
@@ -42,33 +42,31 @@ jobs:
  - uses: actions/checkout@v2
  with:
  submodules: true
- path: vscode-dosbox
- - name: install and test
+
+ - name: install and test vscode-dosbox
  run: |
  yarn install
- yarn test && yarn test-local
+ yarn test
+ yarn test-local
  working-directory: ./vscode-dosbox
  env:
  DISPLAY: ":99.0"
 
- - name: Checkout masm-tasm repo
- uses: actions/checkout@v2
- with:
- repository: dosasm/masm-tasm
- path: masm-tasm
-
  - name: package
  run: node dev/package.js
  working-directory: ./vscode-dosbox
 
- - name: install and test
+ - name: install and test ./masm-tasm
  run: |
  yarn
  yarn test && yarn test-web
  working-directory: ./masm-tasm
  env:
  DISPLAY: ":99.0"
 
+ - run: yarn lint
+ if: runner.os == 'Linux'
+
  build:
  needs: test
  if: success()
@@ -81,19 +79,26 @@ jobs:
  - uses: actions/setup-node@v2
  with:
  node-version: "14"
- - name: install dependencies with yarn
- run: yarn install
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Package the extension
- run: node dev/package.js --all
+ 
+ - name: install and package vscode-dosbox
+ working-directory: ./vscode-dosbox
+ run: |
+ yarn
+ node dev/package.js --all
  - uses: actions/upload-artifact@v2
  with:
  name: "vscepackages"
- path: "*.vsix"
+ path: "./vscode-dosbox/*.vsix"
 
  - run: npx vsce publish --packagePath $(find . -iname "*.vsix")
+ working-directory: ./vscode-dosbox
  env:
  VSCE_PAT: ${{ secrets.VSCE_PAT }}
  if: success() && startsWith( github.ref, 'refs/tags/')
+
+ - name: Publish
+ if: success() && startsWith( github.ref, 'refs/tags/') && matrix.os == 'ubuntu-latest'
+ run: npx vsce publish --yarn
+ working-directory: ./masm-tasm
+ env:
+ VSCE_PAT: ${{ secrets.VSCE_PAT }}

.github/workflows/dosbox.yml .github/workflows/vscode.yml.github/workflows/dosbox.yml renamed to .github/workflows/vscode.yml

@@ -0,0 +1,4 @@
+[submodule "bundles"]
+path = bundles
+url = git@github.com:dosasm/assembly-tool.git
+branch = gh-pages

.gitmodules

@@ -14,7 +14,7 @@ if (process.argv.includes('copy') || process.argv.includes('copy-emulators')) {
 }
 
 if (process.argv.includes('copy') || process.argv.includes('copy-bundles')) {
- const srcDir = path.resolve(__dirname, '../', 'bundles', 'out');
+ const srcDir = path.resolve(__dirname, '../', 'bundles');
  const dstDir = path.resolve(__dirname, 'public', 'bundles');
  if (!fs.existsSync(dstDir)) {
  fs.mkdirSync(dstDir)