Merge branch 'renovate/flyway' into 'main'
fix(deps): update flyway to v11.8.2 See merge request anthorob/netneutrality!30
This commit is contained in:
commit
acb11c3d9a
4 files changed
+5
-9
No files matched your search
@@ -66,8 +66,6 @@ package:
|
|||||||
rules:
|
rules:
|
||||||
- if: '$CI_COMMIT_TAG'
|
- if: '$CI_COMMIT_TAG'
|
||||||
- if: '$CI_COMMIT_BRANCH == "main"'
|
- if: '$CI_COMMIT_BRANCH == "main"'
|
||||||
when: manual
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
docker-build:
|
docker-build:
|
||||||
stage: docker-build
|
stage: docker-build
|
||||||
|
|||||||
+1
-2
@@ -26,8 +26,7 @@ if (-not $MYSQL_HOST -or -not $MYSQL_PORT -or -not $MYSQL_DATABASE) {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
$env:LOCALDEV_FLYWAY_URL = "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}"
|
$env:FLYWAY_URL = "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}"
|
||||||
$env:FLYWAY_URL = $env:LOCALDEV_FLYWAY_URL
|
|
||||||
$env:FLYWAY_USER = $env:MYSQL_USER
|
$env:FLYWAY_USER = $env:MYSQL_USER
|
||||||
$env:FLYWAY_PASSWORD = $env:MYSQL_PASSWORD
|
$env:FLYWAY_PASSWORD = $env:MYSQL_PASSWORD
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -17,8 +17,7 @@ if [[ -z "$MYSQL_HOST" || -z "$MYSQL_PORT" || -z "$MYSQL_DATABASE" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export LOCALDEV_FLYWAY_URL="jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}"
|
export FLYWAY_URL="jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}"
|
||||||
export FLYWAY_URL="$LOCALDEV_FLYWAY_URL"
|
|
||||||
export FLYWAY_USER="$MYSQL_USER"
|
export FLYWAY_USER="$MYSQL_USER"
|
||||||
export FLYWAY_PASSWORD="$MYSQL_PASSWORD"
|
export FLYWAY_PASSWORD="$MYSQL_PASSWORD"
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.flywaydb</groupId>
|
<groupId>org.flywaydb</groupId>
|
||||||
<artifactId>flyway-maven-plugin</artifactId>
|
<artifactId>flyway-maven-plugin</artifactId>
|
||||||
<version>11.3.4</version>
|
<version>11.8.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<url>${env.FLYWAY_URL}</url>
|
<url>${env.FLYWAY_URL}</url>
|
||||||
<user>${env.FLYWAY_USER}</user>
|
<user>${env.FLYWAY_USER}</user>
|
||||||
@@ -184,12 +184,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.flywaydb</groupId>
|
<groupId>org.flywaydb</groupId>
|
||||||
<artifactId>flyway-core</artifactId>
|
<artifactId>flyway-core</artifactId>
|
||||||
<version>11.3.4</version>
|
<version>11.8.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.flywaydb</groupId>
|
<groupId>org.flywaydb</groupId>
|
||||||
<artifactId>flyway-mysql</artifactId>
|
<artifactId>flyway-mysql</artifactId>
|
||||||
<version>11.3.4</version>
|
<version>11.8.2</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user