From 8c61e3a98a251a217e304c99c7478c70a479da64 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Tue, 15 Dec 2020 07:07:44 -0500 Subject: [PATCH 1/2] fix github actions --- .gitattributes | 9 +++++++++ .github/workflows/node.js.yml | 24 +++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..90da0d1e799 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# see: https://docs.github.com/en/free-pro-team@latest/github/using-git/configuring-git-to-handle-line-endings#per-repository-settings + +# Set the default behavior to use LF line endings +* text eol=lf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.mvt binary +*.pbf binary diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 2142c074dd6..628b33cf8c5 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -4,25 +4,29 @@ name: Node.js CI on: push: - branches: [ foobar ] # main -- disabled until a runner with GPU is available + branches: [ main ] pull_request: - branches: [ foobar ] # main -- disabled until a runner with GPU is available + branches: [ main ] jobs: build: strategy: + fail-fast: false matrix: os: - ubuntu-latest - # - macos-latest - # - windows-latest + - macos-latest node_version: - 10 - - 12 - - 14 architecture: - x64 + # TODO windows not working yet + include: + - node_version: 10 + os: windows-latest + architecture: x64 + experimental: true name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -34,4 +38,10 @@ jobs: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.architecture }} - run: yarn install --frozen-lockfile - - run: yarn test + - if: ${{ runner.os == 'Windows' }} + run: npm config set script-shell bash.EXE + # see: https://github.com/stackgl/headless-gl#how-can-headless-gl-be-used-on-a-headless-linux-machine + - if: ${{ runner.os == 'Linux' }} + run: xvfb-run -s "-ac -screen 0 1280x1024x24" yarn test + - if: ${{ runner.os != 'Linux' }} + run: yarn test From 4f61e92276bc5b5633adafbd5464e3ba1fab2e07 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Tue, 15 Dec 2020 07:21:28 -0500 Subject: [PATCH 2/2] just comment out windows --- .github/workflows/node.js.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 628b33cf8c5..2f3f427a7f7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -17,16 +17,12 @@ jobs: os: - ubuntu-latest - macos-latest + # TODO re-enable when we get windows working + # - windows-latest node_version: - 10 architecture: - x64 - # TODO windows not working yet - include: - - node_version: 10 - os: windows-latest - architecture: x64 - experimental: true name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }} runs-on: ${{ matrix.os }}