From 939ee005d27fe123ce75c832e9706fe2825dc642 Mon Sep 17 00:00:00 2001 From: mazano Date: Tue, 7 May 2024 16:56:33 +0200 Subject: [PATCH 1/3] activate vector tiles by default and also wms integration (#643) --- .github/workflows/build-latest.yaml | 6 +++++- .github/workflows/deploy-image.yaml | 1 + build_data/gwc-gs.xml | 2 ++ scripts/env-data.sh | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 70d103db..46ec4ae7 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -21,6 +21,7 @@ jobs: build-activemq-docker-image: runs-on: ubuntu-latest timeout-minutes: 20 + if: github.actor != 'dependabot[bot]' steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -50,6 +51,7 @@ jobs: build-docker-image: runs-on: ubuntu-latest timeout-minutes: 20 + if: github.actor != 'dependabot[bot]' strategy: matrix: geoserverMajorVersion: @@ -121,6 +123,7 @@ jobs: scan_image: runs-on: ubuntu-latest timeout-minutes: 20 + if: github.actor != 'dependabot[bot]' needs: [build-docker-image, run-scenario-tests] steps: - uses: actions/checkout@v4 @@ -151,6 +154,7 @@ jobs: run-scenario-tests: runs-on: ubuntu-latest timeout-minutes: 20 + if: github.actor != 'dependabot[bot]' needs: [ build-docker-image, build-activemq-docker-image] strategy: matrix: @@ -191,7 +195,7 @@ jobs: bash ./test.sh push-internal-pr-images: - if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url + if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && github.actor != 'dependabot[bot]' runs-on: ubuntu-latest timeout-minutes: 20 needs: [ build-docker-image, run-scenario-tests ] diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index aec8e8f4..3cc35c37 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -10,6 +10,7 @@ on: - completed jobs: deploy-image: + if: github.actor != 'dependabot[bot]' runs-on: ubuntu-latest timeout-minutes: 20 env: diff --git a/build_data/gwc-gs.xml b/build_data/gwc-gs.xml index d5d01098..e9f93c60 100644 --- a/build_data/gwc-gs.xml +++ b/build_data/gwc-gs.xml @@ -33,10 +33,12 @@ image/jpeg + application/vnd.mapbox-vector-tile image/png image/jpeg + application/vnd.mapbox-vector-tile image/png image/jpeg diff --git a/scripts/env-data.sh b/scripts/env-data.sh index 30286715..779275a3 100644 --- a/scripts/env-data.sh +++ b/scripts/env-data.sh @@ -15,7 +15,7 @@ if [ -z "${OPTIMIZE_LINE_WIDTH}" ]; then fi if [ -z "${WMS_DIR_INTEGRATION}" ]; then - WMS_DIR_INTEGRATION=false + WMS_DIR_INTEGRATION=true fi if [ -z "${REQUIRE_TILED_PARAMETER}" ]; then From 6ddf36364706798e451e11df5eacd1b61363e474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 03:26:28 +0200 Subject: [PATCH 2/3] Bump github/codeql-action from 2 to 3 (#638) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 46ec4ae7..be72108d 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -147,7 +147,7 @@ jobs: vuln-type: 'os,library' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' From 8820030391b085d806bc9fa30c12359842a96bb9 Mon Sep 17 00:00:00 2001 From: miceg <164135984+miceg@users.noreply.github.com> Date: Fri, 10 May 2024 12:06:06 +1000 Subject: [PATCH 3/3] Don't remove the login package (#640) Don't delete the login package. Co-authored-by: mazano --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8aca6b93..5ee7aeb2 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,6 @@ RUN set -eux; \ ttf-bitstream-vera ttf-sjfonts tv-fonts libapr1-dev libssl-dev git \ wget zip unzip curl xsltproc certbot cabextract gettext postgresql-client figlet gosu gdal-bin libgdal-java; \ dpkg-divert --local --rename --add /sbin/initctl \ - && (echo "Yes, do as I say!" | apt-get remove --force-yes login) \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*; \ # verify that the binary works