From e1644a58bd8df5318354de24cb50e5c0a818f97e Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 25 Oct 2022 20:53:11 -0400 Subject: [PATCH 1/4] add testing on push --- .github/workflows/Test.yml | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/Test.yml diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml new file mode 100644 index 0000000..3ad3e50 --- /dev/null +++ b/.github/workflows/Test.yml @@ -0,0 +1,40 @@ +name: "Test" + +on: + push: + workflow_dispatch: + +jobs: + release: + name: "Test ${{ github.ref }}" + runs-on: ubuntu-latest + + steps: + - + name: "Checkout source code" + uses: "actions/checkout@v3.1.0" + with: + ref: ${{ github.ref }} + - + name: Set up node + uses: actions/setup-node@v3 + with: + node-version: '16' + - + name: Update packages + run: sudo apt update -qq + - + name: Install apt packages + run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev + - + name: Install node dependencies + run: npm install + - + name: Download test data + run: wget -O test_data.zip https://github.com/acalcutt/tileserver-gl/releases/download/test_data/test_data.zip + - + name: Unzip test data + run: unzip -q test_data.zip -d test_data + - + name: Run tests + run: xvfb-run --server-args="-screen 0 1024x768x24" npm test From f7cfe3adff595963ed0e6e6a730a32661e0ee63d Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 25 Oct 2022 20:54:10 -0400 Subject: [PATCH 2/4] amd64/arm64 docker + npm publish --- .github/workflows/Build_Test_Release.yml | 109 +++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 .github/workflows/Build_Test_Release.yml diff --git a/.github/workflows/Build_Test_Release.yml b/.github/workflows/Build_Test_Release.yml new file mode 100644 index 0000000..ac8811b --- /dev/null +++ b/.github/workflows/Build_Test_Release.yml @@ -0,0 +1,109 @@ +name: "Build, Test, Publish" + +on: + workflow_dispatch: + inputs: + docker_user: + description: 'Docker Username' + required: true + docker_token: + description: 'Docker Token' + required: true + npm_token: + description: 'NPM Token' + required: true + +jobs: + release: + name: "Build, Test, Publish" + runs-on: ubuntu-latest + + steps: + - + name: "Checkout source code" + uses: "actions/checkout@v3.1.0" + with: + ref: ${{ github.ref }} + - + name: Set up node + uses: actions/setup-node@v3 + with: + node-version: '16' + - + name: Get version + run: | + echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | head -n 1)" >> $GITHUB_ENV + - + name: Update packages + run: sudo apt update -qq + - + name: Install apt packages + run: sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev + - + name: Install node dependencies + run: npm install + - + name: Download test data + run: wget -O test_data.zip https://github.com/acalcutt/tileserver-gl/releases/download/test_data/test_data.zip + - + name: Unzip test data + run: unzip -q test_data.zip -d test_data + - + name: Run tests + run: xvfb-run --server-args="-screen 0 1024x768x24" npm test + - + name: Remove Test Data + run: rm -R test_data* + - + name: Publish to Full Version NPM + run: | + npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} + npm publish --access public + env: + NPM_TOKEN: ${{ github.event.inputs.npm_token }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: 'arm64' + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ github.event.inputs.docker_user }} + password: ${{ github.event.inputs.docker_token }} + - + name: Build and publish Full Version to Docker Hub + uses: docker/build-push-action@v3 + with: + context: . + push: true + tags: maptiler/tileserver-gl:latest, maptiler/tileserver-gl:${{ env.PACKAGE_VERSION }} + platforms: linux/arm64,linux/amd64 + - + name: Create Tileserver Light Directory + run: node publish.js --no-publish + - + name: Install node dependencies + run: npm install + working-directory: ./light + - + name: Publish to Light Version NPM + working-directory: ./light + run: | + npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} + npm publish --access public + env: + NPM_TOKEN: ${{ github.event.inputs.npm_token }} + - + name: Build and publish Light Version to Docker Hub + uses: docker/build-push-action@v3 + with: + context: ./light + file: ./light/Dockerfile + push: true + tags: maptiler/tileserver-gl-light:latest, maptiler/tileserver-gl-light:${{ env.PACKAGE_VERSION }} + platforms: linux/arm64,linux/amd64 From c669b57115ee47c08bd9da61386a141aa7afe2a1 Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 25 Oct 2022 21:05:22 -0400 Subject: [PATCH 3/4] fix test data urls --- .github/workflows/Build_Test_Release.yml | 2 +- .github/workflows/Test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build_Test_Release.yml b/.github/workflows/Build_Test_Release.yml index ac8811b..0617ea5 100644 --- a/.github/workflows/Build_Test_Release.yml +++ b/.github/workflows/Build_Test_Release.yml @@ -44,7 +44,7 @@ jobs: run: npm install - name: Download test data - run: wget -O test_data.zip https://github.com/acalcutt/tileserver-gl/releases/download/test_data/test_data.zip + run: wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip - name: Unzip test data run: unzip -q test_data.zip -d test_data diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 3ad3e50..4c5eb94 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -31,7 +31,7 @@ jobs: run: npm install - name: Download test data - run: wget -O test_data.zip https://github.com/acalcutt/tileserver-gl/releases/download/test_data/test_data.zip + run: wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip - name: Unzip test data run: unzip -q test_data.zip -d test_data From df5c4b99b3ebdf9b5f0c43b8fdfa8823338c36f9 Mon Sep 17 00:00:00 2001 From: acalcutt Date: Tue, 25 Oct 2022 21:16:54 -0400 Subject: [PATCH 4/4] on pull request --- .github/workflows/Test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 4c5eb94..94c6172 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -2,6 +2,7 @@ name: "Test" on: push: + pull_request: workflow_dispatch: jobs: