diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68cb765d8..8ff773b76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,6 +184,13 @@ jobs: config: e2e/java.json dry-run: true + - name: docker-builder (swift) + uses: ./ + with: + command: docker-builder + config: e2e/swift.json + dry-run: true + - name: binary-builder (python) uses: ./ with: diff --git a/Dockerfile b/Dockerfile index c4c8b933f..11ac60f5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,9 @@ ARG HELM_VERSION=3.4.0 # renovate: datasource=adoptium-java depName=java ARG JAVA_VERSION=8.0.302+8 +# renovate: datasource=docker depName=swift versioning=loose +ARG SWIFT_VERSION=5.5.2 + ARG DISTRO=latest RUN echo DISTRO=$DISTRO ENTRYPOINT ["echo" ] diff --git a/e2e/swift.json b/e2e/swift.json new file mode 100644 index 000000000..6fa198ef3 --- /dev/null +++ b/e2e/swift.json @@ -0,0 +1,5 @@ +{ + "image": "swift", + "startVersion": "5.3", + "extractVersion": "^(?\\d+\\.\\d+(?:\\.\\d+)?)$" +} diff --git a/renovate.json b/renovate.json index f215b6740..fbe047cf2 100644 --- a/renovate.json +++ b/renovate.json @@ -15,6 +15,10 @@ "extends": ["schedule:weekly"], "automerge": true, "separateMinorPatch": false + }, + { + "matchPackageNames": ["swift"], + "extractVersion": "^(?\\d+\\.\\d+(?:\\.\\d+)?)$" } ] } diff --git a/src/commands/docker/builder.ts b/src/commands/docker/builder.ts index c234c31c2..25c4d943e 100644 --- a/src/commands/docker/builder.ts +++ b/src/commands/docker/builder.ts @@ -58,10 +58,18 @@ async function getBuildList({ if (!pkgResult) { return []; } + + log(`Found ${pkgResult.releases.length} raw versions`); + let allVersions = pkgResult.releases .map((v) => v.version) .filter((v) => ver.isVersion(v) && ver.isCompatible(v, startVersion)); + log( + `Found ${allVersions.length} compatible versions:`, + allVersions.join(', ') + ); + // filter duplicate versions (16.0.2+7 == 16.0.2+8) allVersions = allVersions .reverse() diff --git a/test/__snapshots__/util.spec.ts.snap b/test/__snapshots__/util.spec.ts.snap index 2c4903cb2..b4373c01c 100644 --- a/test/__snapshots__/util.spec.ts.snap +++ b/test/__snapshots__/util.spec.ts.snap @@ -20,6 +20,9 @@ ARG HELM_VERSION=3.4.0 # renovate: datasource=adoptium-java depName=java ARG JAVA_VERSION=8.0.302+8 +# renovate: datasource=docker depName=swift versioning=loose +ARG SWIFT_VERSION=5.5.2 + ARG DISTRO=latest RUN echo DISTRO=$DISTRO ENTRYPOINT [\\"echo\\" ] @@ -46,6 +49,9 @@ ARG HELM_VERSION=3.4.0 # renovate: datasource=adoptium-java depName=java ARG JAVA_VERSION=8.0.302+8 +# renovate: datasource=docker depName=swift versioning=loose +ARG SWIFT_VERSION=5.5.2 + ARG DISTRO=latest RUN echo DISTRO=$DISTRO ENTRYPOINT [\\"echo\\" ]