diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9402efd..608ab7bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,8 +96,8 @@ jobs: run: | args=( -Pversion=${{ needs.context.outputs.version }} \ -PsemanticVersion=${{ needs.context.outputs.semanticVersion }} \ - -Pnexus.username=${{ secrets.OSS_NEXUS_USER }} \ - -Pnexus.password=${{ secrets.OSS_NEXUS_TOKEN }} ) + -Pnexus.username=${{ secrets.ORG_NEXUS_USER }} \ + -Pnexus.password=${{ secrets.ORG_NEXUS_TOKEN }} ) ./gradlew publish "${args[@]}" analysis: @@ -123,9 +123,6 @@ jobs: key: ${{ runner.os }}-sonar-qwe restore-keys: ${{ runner.os }}-sonar-qwe - - name: Generate jOOQ - run: ./generateJooq.sh - - name: Test if: env.ENABLE_TEST == 'true' run: ./gradlew test jacocoTestReport -PjacocoHtml=false @@ -179,8 +176,8 @@ jobs: -Psigning.gnupg.homeDir=/home/runner/.gnupg \ -Psigning.gnupg.keyName=${{ steps.import_gpg.outputs.keyid }} \ -Psigning.gnupg.passphrase=${{ secrets.OSS_GPG_PASSPHARSE }} \ - -Pnexus.username=${{ secrets.OSS_NEXUS_USER }} \ - -Pnexus.password=${{ secrets.OSS_NEXUS_TOKEN }} ) + -Pnexus.username=${{ secrets.ORG_NEXUS_USER }} \ + -Pnexus.password=${{ secrets.ORG_NEXUS_TOKEN }} ) ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Prelease "${args[@]}" - name: Publish GitHub Package diff --git a/generateJooq.ps1 b/generateJooq.ps1 deleted file mode 100644 index 64f5b6bd..00000000 --- a/generateJooq.ps1 +++ /dev/null @@ -1,46 +0,0 @@ -param( - $SLEEP_TIME = 3, - $DOCKER_ADDRESS = 'localhost' -) - -$pg_dir = 'build/db/pg' -$pg_img = 'postgres:10-alpine' - -New-Item $pg_dir -ItemType Directory -ea 0 -Copy-Item -Recurse -Force -Path sql/src/test/resources/pg_schema.sql -Destination $pg_dir - -docker pull $pg_img - -try -{ - docker rm -f postgres-gen postgres-temp -} -catch -{ - #slient -} - -try -{ - docker volume rm -f postgres-gen-db -} -catch -{ - -} - -docker volume create --name postgres-gen-db -docker container create --name postgres-temp -v postgres-gen-db:/data hello-world -docker cp "$( Get-Location )/$pg_dir/." postgres-temp:/data -docker rm -f postgres-temp - -docker run -d --name postgres-gen -p 5423:5432 ` - -v postgres-gen-db:"/docker-entrypoint-initdb.d" ` - -e "POSTGRES_PASSWORD=123" ` - -e "POSTGRES_DB=testdb" ` - $pg_img postgres - -sleep "$SLEEP_TIME" -gradle clean generateJooq -PpgHost="$DOCKER_ADDRESS" - -docker rm -f postgres-gen diff --git a/generateJooq.sh b/generateJooq.sh deleted file mode 100755 index ad315009..00000000 --- a/generateJooq.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -SLEEP_TIME=${1:-3} -pg_dir=build/db/pg -pg_img=postgres:10-alpine - -mkdir -p $pg_dir -cp -rf sql/src/test/resources/pg_schema.sql $pg_dir - -docker pull $pg_img - -docker rm -f postgres-gen - -docker run -d --name postgres-gen -p 5423:5432 \ - -v "$(pwd)/$pg_dir":/docker-entrypoint-initdb.d/ \ - -e POSTGRES_PASSWORD=123 -e POSTGRES_DB=testdb \ - $pg_img postgres - -sleep "$SLEEP_TIME" -./gradlew clean generateJooq - -docker rm -f postgres-gen