Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

activate vector tiles by default and also wms integration #643

Merged
merged 1 commit into from
May 7, 2024
Merged

activate vector tiles by default and also wms integration #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build-latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -50,6 +51,7 @@ jobs:
build-docker-image:
runs-on: ubuntu-latest
timeout-minutes: 20
if: github.actor != 'dependabot[bot]'
strategy:
matrix:
geoserverMajorVersion:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 ]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- completed
jobs:
deploy-image:
if: github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
timeout-minutes: 20
env:
Expand Down
2 changes: 2 additions & 0 deletions build_data/gwc-gs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@
<string>image/jpeg</string>
</defaultCoverageCacheFormats>
<defaultVectorCacheFormats>
<string>application/vnd.mapbox-vector-tile</string>
<string>image/png</string>
<string>image/jpeg</string>
</defaultVectorCacheFormats>
<defaultOtherCacheFormats>
<string>application/vnd.mapbox-vector-tile</string>
<string>image/png</string>
<string>image/jpeg</string>
</defaultOtherCacheFormats>
Expand Down
2 changes: 1 addition & 1 deletion scripts/env-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading