diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4c58edd0..128be2a6 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -24,14 +24,14 @@ jobs: FF_VERSION: '9.0.2' steps: - name: Checkout code changes - uses: actions/checkout@v7 + uses: actions/checkout@v2.31.1 - name: Cache FFmpeg binaries id: cache-ffmpeg - uses: actions/cache@v6 + uses: actions/cache@v2.31.1 with: path: ${{ runner.temp }}/ffmpeg - key: ffmpeg-static-${{ runner.os }}-${{ env.FF_VERSION }} + key: ffmpeg-static-${{ runner.os }}-${{ env2.31.1FF_VERSION }} - name: Setup FFmpeg if: steps.cache-ffmpeg.outputs.cache-hit != 'true' @@ -46,13 +46,13 @@ jobs: run: echo "$RUNNER_TEMP/ffmpeg" >> "$GITHUB_PATH" - name: Setup Java - uses: actions/setup-java@v6 + uses: actions/setup-java@v2.31.1 with: distribution: temurin java-version: 26 - name: Setup project and upload dependency graph - uses: gradle/actions/setup-gradle@v6 + uses: gradle/actions/setup-gradle@v2.31.1 with: dependency-graph: generate-and-submit build-scan-publish: true @@ -71,13 +71,13 @@ jobs: security-events: write steps: - name: Checkout code changes - uses: actions/checkout@v7 + uses: actions/checkout@v2.31.1 with: ref: ${{ github.event.pull_request.head.sha || github.sha }} fetch-depth: 0 - name: Execute analysis - uses: JetBrains/qodana-action@v2026.2.1 + uses: JetBrains/qodana-action@v2.31.1 env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} with: @@ -89,6 +89,6 @@ jobs: - name: Upload results to GitHub if: ${{ !cancelled() }} - uses: github/codeql-action/upload-sarif@v4 + uses: github/codeql-action/upload-sarif@v2.31.1 with: sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json diff --git a/Dockerfile b/Dockerfile index 95975f5f..68f142a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,14 +10,14 @@ RUN --mount=type=cache,target=/root/.gradle ./gradlew check installDist --no-dae FROM alpine:3.24.2 -# bump: OpenTelemetry /v([\d.]+)/ github:open-telemetry/opentelemetry-java-instrumentation|/^v[\d.]+$/|sort +# bump: OpenTelemetry /v([\d.]+)/ git:https://github.com/open-telemetry/opentelemetry-java-instrumentation.git|/\d+\./|* ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.31.1/opentelemetry-javaagent.jar \ /app/opentelemetry-agent.jar COPY --from=builder /usr/bin/ff* /usr/bin/ COPY --from=builder /app/build/install/Stickerify/ . -ENV OTEL_SDK_DISABLED=true +ENV OTEL_SDK_ENABLED=false ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-agent.jar ENV CONCURRENT_PROCESSES=5 CMD ["./bin/Stickerify"] diff --git a/Railway.dockerfile b/Railway.dockerfile index 3cf830c0..648474dc 100644 --- a/Railway.dockerfile +++ b/Railway.dockerfile @@ -6,4 +6,4 @@ ARG CONCURRENT_PROCESSES ENV STICKERIFY_TOKEN=$STICKERIFY_TOKEN \ LOG_LEVEL=$LOG_LEVEL \ CONCURRENT_PROCESSES=$CONCURRENT_PROCESSES \ - OTEL_SDK_DISABLED=false + OTEL_SDK_ENABLED=true