Merge pull request #117 from naver/develop

Release v1.1.2-p1

Reviewed-by: @taeyeon-Kim

.github/workflows/build-develop.yml

@@ -92,3 +92,38 @@ jobs:
         with:
           name: scavenger-api
           path: scavenger-api/build/test-results
+  scavenger-schema:
+    runs-on: ubuntu-latest
+    services:
+      database:
+        image: mysql:8.0.28
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: scavenger
+          MYSQL_DATABASE: scavenger
+          MYSQL_USER: scavenger
+          MYSQL_PASSWORD: scavenger
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build with Gradle
+        run: SPRING_PROFILES_ACTIVE=mysql ./gradlew :scavenger-collector:clean scavenger-collector:test --tests ScavengerCollectorApplicationTest

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
       - name: Extract tag version
-        run: echo "tag=$(echo '${{ github.ref_name }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" >> $GITHUB_OUTPUT
+        run: echo "tag=$(echo '${{ github.ref_name }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(-p[0-9]+)?')" >> $GITHUB_OUTPUT
         id: extract_tag_version
       - name: Build project
         run: ./gradlew clean build

.github/workflows/tag.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           token: ${{ secrets.RELEASE_ACTIONS_TOKEN }}
       - name: Extract version
-        run: echo "version=$(echo '${{ github.event.pull_request.title }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" >> $GITHUB_OUTPUT
+        run: echo "version=$(echo '${{ github.event.pull_request.title }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(-p[0-9]+)?')" >> $GITHUB_OUTPUT
         id: extract_version
       - name: Set git config
         run: |

doc/installation.md

@@ -56,6 +56,7 @@ If you've built your own MySQL, follow the steps below.
     CREATE DATABASE scavenger;
     ```
 4. Use the `-D` option to set the following four properties.
+    - `spring.profiles.active=mysql`
     - `spring.datasource.url={mysql url}`
     - `spring.datasource.username={mysql user name}`
     - `spring.datasource.password={mysql password}`
@@ -111,6 +112,7 @@ If you've built your own MySQL, follow the steps below.
     CREATE DATABASE scavenger;
     ```
 4. Use the `-D` option to set the following four properties.
+    - `spring.profiles.active=mysql`
     - `spring.datasource.url={mysql url}`
     - `spring.datasource.username={mysql user name}`
     - `spring.datasource.password={mysql password}`

scavenger-collector/src/test/kotlin/com/navercorp/scavenger/ScavengerCollectorApplicationTest.kt

@@ -0,0 +1,11 @@
+package com.navercorp.scavenger
+
+import org.junit.jupiter.api.Test
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class ScavengerCollectorApplicationTest {
+    @Test
+    fun contextLoads() {
+    }
+}

scavenger-collector/src/test/resources/application-mysql.yml

@@ -0,0 +1,6 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/scavenger
+    username: scavenger
+    password: scavenger
+    driver-class-name: com.mysql.cj.jdbc.Driver

scavenger-schema/src/main/resources/db/changelog/schema-1.1.2.sql

@@ -1,3 +1,5 @@
---changeset scavenger:3
+--liquibase formatted sql
 
-ALTER TABLE snapshot_nodes MODIFY signature TEXT;
+--changeset scavenger:5
+
+ALTER TABLE snapshot_nodes MODIFY COLUMN signature TEXT;