Merge pull request #554 from Rakambda/develop

2.2.6
RakambdaOrg · Jul 27, 2023 · 3e83c06 · 3e83c06
2 parents a3610fd + aca3d7a
commit 3e83c06
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 68 deletions.
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -29,6 +29,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -31,12 +31,14 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradlew executable
-        run: chmod +x ./gradlew
+
       - name: Build project
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: assemble --scan
+          arguments: |
+            assemble
+            --scan
+
       - name: Upload miner jar file
         uses: actions/upload-artifact@v3
         with:
@@ -68,12 +70,14 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradlew executable
-        run: chmod +x ./gradlew
+
       - name: Run tests
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: :miner:test --scan
+          arguments: |
+            :miner:test
+            --scan
+
       - name: Generate JaCoCo report
         uses: gradle/gradle-build-action@v2
         if: always()
@@ -127,12 +131,14 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradlew executable
-        run: chmod +x ./gradlew
+
       - name: Run tests
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: :viewer:test --scan
+          arguments: |
+            :viewer:test
+            --scan
+
       - name: Generate JaCoCo report
         uses: gradle/gradle-build-action@v2
         if: always()
@@ -188,10 +194,18 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradle permissions
-        run: chmod +x gradlew
+
+      - name: Calculate miner image name
+        id: miner-image-name
+        run: echo "IMAGE_NAME=${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
       - name: Push branch/tag on Docker Hub
-        run: ./gradlew :miner:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :miner:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
 
   publish-viewer:
     name: Publish Viewer on DockerHub
@@ -209,7 +223,15 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradle permissions
-        run: chmod +x gradlew
+
+      - name: Calculate viewer image name
+        id: viewer-image-name
+        run: echo "IMAGE_NAME=${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
       - name: Push branch/tag on Docker Hub
-        run: ./gradlew :viewer:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :viewer:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml
@@ -1,4 +1,3 @@
-
 name: Manually deploy docker
 
 on:
@@ -22,13 +21,29 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradle permissions
-        run: chmod +x gradlew
+
+      - name: Calculate miner image name
+        id: miner-image-name
+        run: |
+          echo "IMAGE_NAME=${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
+          echo "IMAGE_NAME_LATEST=${DOCKER_MINER_IMAGE_NAME}:latest" >> "$GITHUB_OUTPUT"
       - name: Push branch/tag on Docker Hub
-        run: ./gradlew :miner:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :miner:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
       - name: Push latest on Docker Hub
         if: success() && github.ref == 'refs/heads/main'
-        run: ./gradlew :miner:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:latest"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :miner:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME_LATEST }}
 
   publish-viewer:
     name: Publish Viewer on DockerHub
@@ -42,10 +57,26 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.APP_JAVA_VERSION }}
-      - name: Set gradle permissions
-        run: chmod +x gradlew
+
+      - name: Calculate viewer image name
+        id: viewer-image-name
+        run: |
+          echo "IMAGE_NAME=${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
+          echo "IMAGE_NAME_LATEST=${DOCKER_VIEWER_IMAGE_NAME}:latest" >> "$GITHUB_OUTPUT"
       - name: Push branch/tag on Docker Hub
-        run: ./gradlew :viewer:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :viewer:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
       - name: Push latest on Docker Hub
         if: success() && github.ref == 'refs/heads/main'
-        run: ./gradlew :viewer:jib -PdockerUsername=${{ secrets.DOCKER_USERNAME }} -PdockerPassword=${{ secrets.DOCKER_TOKEN }} -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:latest"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            :viewer:jib
+            -PdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -PdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME_LATEST }}
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -22,14 +22,15 @@ jobs:
           node-version: '16'
       - name: Install Antora
         run: npm i antora asciidoctor-kroki
+
       - name: Generate Site
         run: npx antora .github/antora-playbook.yml
       - name: Prepare upload
         run: |
           mkdir pages
           cp -R .github/antora-docs/. pages
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           path: pages
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=2.2.5
+version=2.2.6
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,38 +2,38 @@
 slf4j-version = "2.0.7"
 log4j2-version = "2.20.0"
 log4j2-slf4j-version = "2.20.0"
-unirest-version = "4.0.0-RC12"
+unirest-version = "4.0.3"
 picocli-version = "4.7.4"
 jackson-version = "2.15.2"
 jsonschema-generator-version = "4.31.1"
 httpclient-version = "4.5.14"
 lang3-version = "3.12.0"
 commons-text-version = "1.10.0"
 jetbrains-annotations-version = "24.0.1"
-websocket-version = "1.5.3"
+websocket-version = "1.5.4"
 junit-version = "5.9.3"
 assertj-core-version = "3.24.2"
 assertj-db-version = "2.0.2"
 mockito-version = "5.2.0"
 awaitility-version = "4.2.0"
-json-unit-version = "2.38.0"
+json-unit-version = "3.0.0"
 kitteh-irc-version = "8.0.0"
 hikari-cp-version = "5.0.1"
 mariadb-version = "3.1.4"
 sqlite-version = "3.42.0.0"
-mysql-version = "8.0.33"
+mysql-version = "8.1.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "9.20.0"
-selenide-version = "6.16.0"
+flyway-version = "9.21.1"
+selenide-version = "6.16.1"
 lombok-version = "1.18.28"
 jacocoVersion = "0.8.10"
 
 shadow-version = "8.1.1"
 names-version = "0.47.0"
 jib-version = "3.3.2"
 git-properties-version = "2.4.1"
-springboot-version = "3.1.1"
-springboot-dependencies-version = "1.1.0"
+springboot-version = "3.1.2"
+springboot-dependencies-version = "1.1.2"
 test-logger-version = "3.2.0"
 git-version-plugin-version = "3.0.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/...gql/data/dropshighlightserviceavailabledrops/DropsHighlightServiceAvailableDropsData.java b/...gql/data/dropshighlightserviceavailabledrops/DropsHighlightServiceAvailableDropsData.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.Channel;
-import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -21,7 +20,4 @@ public class DropsHighlightServiceAvailableDropsData{
 	@JsonProperty("channel")
 	@NotNull
 	private Channel channel;
-	@JsonProperty("currentUser")
-	@NotNull
-	private User currentUser;
 }
diff --git a/...ata/dropshighlightserviceavailabledrops/DropsHighlightServiceAvailableDropsOperation.java b/...ata/dropshighlightserviceavailabledrops/DropsHighlightServiceAvailableDropsOperation.java
@@ -15,7 +15,7 @@
 public class DropsHighlightServiceAvailableDropsOperation extends IGQLOperation<DropsHighlightServiceAvailableDropsData>{
     public DropsHighlightServiceAvailableDropsOperation(@NotNull String channelId){
         super("DropsHighlightService_AvailableDrops");
-        addPersistedQueryExtension(new PersistedQueryExtension(1, "e589e213f16d9b17c6f0a8ccd18bdd6a8a6b78bc9db67a75efd43793884ff4e5"));
+	    addPersistedQueryExtension(new PersistedQueryExtension(1, "9a62a09bce5b53e26e64a671e530bc599cb6aab1e5ba3cbd5d85966d3940716f"));
         addVariable("channelID", channelId);
     }
 

diff --git a/...a/channelpointsminer/miner/api/gql/gql/GQLApiDropsHighlightServiceAvailableDropsTest.java b/...a/channelpointsminer/miner/api/gql/gql/GQLApiDropsHighlightServiceAvailableDropsTest.java
@@ -7,9 +7,7 @@
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.DropBenefitEdge;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.DropCampaign;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.Game;
-import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.Inventory;
 import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.TimeBasedDrop;
-import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.User;
 import fr.rakambda.channelpointsminer.miner.tests.UnirestMock;
 import fr.rakambda.channelpointsminer.miner.tests.UnirestMockExtension;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -68,10 +66,6 @@ void nominalWithDrops(UnirestMock unirest) throws MalformedURLException{
                                                 .build()))
                                         .build()))
                                 .build())
-                        .currentUser(User.builder()
-                                .id("987654321")
-                                .inventory(Inventory.builder().build())
-                                .build())
                         .build())
                 .build();
 
@@ -94,10 +88,6 @@ void nominalNoDrops(){
                         .channel(Channel.builder()
                                 .id("123456789")
                                 .build())
-                        .currentUser(User.builder()
-                                .id("987654321")
-                                .inventory(Inventory.builder().build())
-                                .build())
                         .build())
                 .build();
 
@@ -110,6 +100,6 @@ void nominalNoDrops(){
 
     @Override
     protected String getValidRequest(){
-        return "{\"extensions\":{\"persistedQuery\":{\"sha256Hash\":\"e589e213f16d9b17c6f0a8ccd18bdd6a8a6b78bc9db67a75efd43793884ff4e5\",\"version\":1}},\"operationName\":\"DropsHighlightService_AvailableDrops\",\"variables\":{\"channelID\":\"%s\"}}".formatted(STREAMER_ID);
+	    return "{\"extensions\":{\"persistedQuery\":{\"sha256Hash\":\"9a62a09bce5b53e26e64a671e530bc599cb6aab1e5ba3cbd5d85966d3940716f\",\"version\":1}},\"operationName\":\"DropsHighlightService_AvailableDrops\",\"variables\":{\"channelID\":\"%s\"}}".formatted(STREAMER_ID);
     }
 }
diff --git a/miner/src/test/resources/api/gql/gql/dropsHighlightServiceAvailableDrops_noDrops.json b/miner/src/test/resources/api/gql/gql/dropsHighlightServiceAvailableDrops_noDrops.json
@@ -4,14 +4,6 @@
       "id": "123456789",
       "viewerDropCampaigns": null,
       "__typename": "Channel"
-    },
-    "currentUser": {
-      "id": "987654321",
-      "inventory": {
-        "gameEventDrops": [],
-        "__typename": "Inventory"
-      },
-      "__typename": "User"
     }
   },
   "extensions": {

diff --git a/miner/src/test/resources/api/gql/gql/dropsHighlightServiceAvailableDrops_withDrops.json b/miner/src/test/resources/api/gql/gql/dropsHighlightServiceAvailableDrops_withDrops.json
@@ -46,14 +46,6 @@
         }
       ],
       "__typename": "Channel"
-    },
-    "currentUser": {
-      "id": "987654321",
-      "inventory": {
-        "gameEventDrops": [],
-        "__typename": "Inventory"
-      },
-      "__typename": "User"
     }
   },
   "extensions": {