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

Fix master error #2964

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Fix master error #2964

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
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
if: env.HAS_SECRETS == 'HAS_SECRETS'
- run: >
docker run --rm --env=GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} mapfish_print_builder
bash -c 'gradle build && gradle publish'
bash -c 'gradle publish'
if: ( startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' ) && env.HAS_SECRETS == 'HAS_SECRETS'

- id: version
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ WORKDIR /src

ENV GRADLE_OPTS=-Dorg.gradle.daemon=false

# Generate the file `libnative-platform.so`
RUN --mount=type=cache,target=/home/gradle/.gradle \
gradle --version

Expand Down Expand Up @@ -41,4 +42,8 @@ RUN --mount=type=cache,target=/home/gradle/.gradle \
cp -r /home/gradle/.gradle /home/gradle/.gradle-backup
RUN mv /home/gradle/.gradle-backup /home/gradle/.gradle

# Be able to use the container with a different user
ENV GRADLE_USER_HOME=/home/gradle/
RUN chmod -R go+rw /home/gradle/

COPY checkstyle_* ./
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,17 @@ checks: build-builder
tests: build-builder
mkdir --parent core/build/reports/
mkdir --parent core/build/resources/
mkdir --parent core/build/scripts/
docker run --rm --user=$(shell id -u):$(shell id -g) \
--volume=$(PWD)/core/src/:/src/core/src/:ro \
--volume=$(PWD)/core/build/reports/:/src/core/build/reports/ \
--volume=$(PWD)/core/build/resources/:/src/core/build/resources/ \
--volume=$(PWD)/core/build/scripts/:/src/core/build/scripts/ \
--volume=$(PWD)/core/src/test/:/src/core/src/test/:ro \
mapfish_print_builder \
gradle --parallel --exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain --exclude-task=:core:violations \
--exclude-task=:core:spotbugsTest --exclude-task=:core:checkstyleTest \
:core:test
:core:test :core:testCli

.PHONY: acceptance-tests-up
acceptance-tests-up: build
Expand Down