Skip to content

Use 3-way merge editor to view and edit SVN merge conflicts #2333

Use 3-way merge editor to view and edit SVN merge conflicts

Use 3-way merge editor to view and edit SVN merge conflicts #2333

Workflow file for this run

name: build
on:
push:
branches:
- 'master'
pull_request:
branches:
- '*'
jobs:
build:
name: ${{ matrix.os }} ${{ matrix.version }}
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'skip ci')"
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13, windows-latest]
version: ['stable', 'insiders']
steps:
- name: Clone repository
uses: actions/checkout@v1
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '12.17'
- name: Install Dependencies
run: 'yarn install --frozen-lockfile || yarn install --frozen-lockfile'
shell: bash
- name: Compile sources for tests
run: yarn run test-compile
- name: Cache VSCode binary
id: cache-vscode
uses: actions/cache@v1
with:
path: .vscode-test
key: vscode-${{ runner.os }}-${{ matrix.version }}-${{ github.run_id }}
restore-keys: |
vscode-${{ runner.os }}-${{ matrix.version }}-
vscode-${{ runner.os }}-
- name: Run tests
uses: GabrielBB/[email protected]
with:
run: yarn test
env:
CODE_VERSION: ${{ matrix.version }}
continue-on-error: ${{ matrix.version == 'insiders' }}
- name: Release
if: startsWith(matrix.os, 'ubuntu') && matrix.version == 'stable' && github.ref == 'refs/heads/master' && github.repository == 'JohnstonCode/svn-scm'
run: |
yarn run organize
yarn run semantic-release
env:
VSCE_TOKEN: ${{ secrets.vsceToken }}
GITHUB_TOKEN: ${{ secrets.githubToken }}
GH_TOKEN: ${{ secrets.githubToken }}
GIT_AUTHOR_EMAIL: ${{ secrets.gitEmail }}
GIT_COMMITTER_EMAIL: ${{ secrets.gitEmail }}
GIT_AUTHOR_NAME: ${{ secrets.gitName }}
GIT_COMMITTER_NAME: ${{ secrets.gitName }}
eslint:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- name: Clone repository
uses: actions/checkout@v1
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '12.17'
- name: Install Dependencies
run: 'yarn install --frozen-lockfile || yarn install --frozen-lockfile'
shell: bash
- name: Lint check
run: yarn run lint --silent -- -f stylish
artifact:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '12.17'
- name: Install Dependencies
run: 'yarn install --frozen-lockfile || yarn install --frozen-lockfile'
shell: bash
- name: Package extension
run: npx vsce package -o svn-scm.vsix
- name: Upload artifact
uses: actions/upload-artifact@v1
with:
name: "svn-scm-${{ github.sha }}.vsix"
path: "svn-scm.vsix"
- name: Package open-vsx extension
run: |
yarn add iconv-lite jschardet
npx vsce package -o svn-scm-ovsx.vsix
- name: Upload open-vsx artifact
uses: actions/upload-artifact@v1
with:
name: "svn-scm-ovsx-${{ github.sha }}.vsix"
path: "svn-scm-ovsx.vsix"