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.

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

[bugfix] Fix GitHub Action configuration #952

Merged
merged 2 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish

# Check that the docker image builds correctly
docker:
Expand Down Expand Up @@ -210,9 +210,9 @@ jobs:
# run: |
# cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
# ./gradlew -Pprod buildDocker -x test -x javadocJar
# docker-compose -f src/main/docker/app.yml up -d
# docker compose -f src/main/docker/app.yml up -d
# yarn run e2e-prod
# docker-compose -f src/main/docker/app.yml down -v
# docker compose -f src/main/docker/app.yml down -v

# Temp fix
# https://github.com/docker/build-push-action/issues/252
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
id: e2e
run: |
cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
docker-compose -f src/main/docker/postgresql.yml up -d
docker compose -f src/main/docker/postgresql.yml up -d
./gradlew bootRun -Pprod -Pe2e-prod-test &>mp.log </dev/null &
yarn run e2e-prod
docker-compose -f src/main/docker/postgresql.yml down -v
docker compose -f src/main/docker/postgresql.yml down -v
./gradlew --stop

- name: Upload screenshots of failed e2e tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository

# Build and push tagged release docker image
docker:
Expand Down
4 changes: 2 additions & 2 deletions src/test/bash/run-prod-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
cp src/test/resources/config/keystore.p12 src/main/resources/config

./gradlew bootrun -Pe2e-prod-test -x test -x javadocJar &
docker-compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
docker compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
set +e

if ./gradlew generateOpenApiSpec && yarn run e2e-prod; then
Expand All @@ -18,5 +18,5 @@ else
EXIT_STATUS=1
fi

docker-compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
docker compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
exit $EXIT_STATUS
Loading