diff --git a/.github/workflows/amazoncorretto-11-al2023.yml b/.github/workflows/amazoncorretto-11-al2023.yml deleted file mode 100644 index 3adefd22..00000000 --- a/.github/workflows/amazoncorretto-11-al2023.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-11-al2023 - -on: - push: - branches: - - main - paths: - - "amazoncorretto-11-al2023/**" - - .github/workflows/amazoncorretto-11-al2023.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-11-al2023/**" - - .github/workflows/amazoncorretto-11-al2023.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-11-al2023 - secrets: inherit diff --git a/.github/workflows/amazoncorretto-11-debian.yml b/.github/workflows/amazoncorretto-11-debian.yml deleted file mode 100644 index ee4d87b5..00000000 --- a/.github/workflows/amazoncorretto-11-debian.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-11-debian - -on: - push: - branches: - - main - paths: - - "amazoncorretto-11-debian/**" - - .github/workflows/amazoncorretto-11-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-11-debian/**" - - .github/workflows/amazoncorretto-11-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-11-debian - secrets: inherit diff --git a/.github/workflows/amazoncorretto-11-windowsservercore.yml b/.github/workflows/amazoncorretto-11-windowsservercore.yml deleted file mode 100644 index 3e8c2d97..00000000 --- a/.github/workflows/amazoncorretto-11-windowsservercore.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: amazoncorretto-11-windowsservercore - -on: - push: - paths: - - "amazoncorretto-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "amazoncorretto-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: amazoncorretto-11-windowsservercore - secrets: inherit diff --git a/.github/workflows/amazoncorretto-11.yml b/.github/workflows/amazoncorretto-11.yml deleted file mode 100644 index b2f9d249..00000000 --- a/.github/workflows/amazoncorretto-11.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-11 - -on: - push: - branches: - - main - paths: - - "amazoncorretto-11/**" - - .github/workflows/amazoncorretto-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-11/**" - - .github/workflows/amazoncorretto-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-11 - secrets: inherit diff --git a/.github/workflows/amazoncorretto-8-al2023.yml b/.github/workflows/amazoncorretto-8-al2023.yml deleted file mode 100644 index bb8932a7..00000000 --- a/.github/workflows/amazoncorretto-8-al2023.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-8-al2023 - -on: - push: - branches: - - main - paths: - - "amazoncorretto-8-al2023/**" - - .github/workflows/amazoncorretto-8-al2023.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-8-al2023/**" - - .github/workflows/amazoncorretto-8-al2023.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-8-al2023 - secrets: inherit diff --git a/.github/workflows/amazoncorretto-8-debian.yml b/.github/workflows/amazoncorretto-8-debian.yml deleted file mode 100644 index 925f61a7..00000000 --- a/.github/workflows/amazoncorretto-8-debian.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-8-debian - -on: - push: - branches: - - main - paths: - - "amazoncorretto-8-debian/**" - - .github/workflows/amazoncorretto-8-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-8-debian/**" - - .github/workflows/amazoncorretto-8-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-8-debian - secrets: inherit diff --git a/.github/workflows/amazoncorretto-8-windowsservercore.yml b/.github/workflows/amazoncorretto-8-windowsservercore.yml deleted file mode 100644 index 293be3a7..00000000 --- a/.github/workflows/amazoncorretto-8-windowsservercore.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: amazoncorretto-8-windowsservercore - -on: - push: - paths: - - "amazoncorretto-8-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "amazoncorretto-8-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: amazoncorretto-8-windowsservercore - secrets: inherit diff --git a/.github/workflows/amazoncorretto-8.yml b/.github/workflows/amazoncorretto-8.yml deleted file mode 100644 index d6e1f80e..00000000 --- a/.github/workflows/amazoncorretto-8.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: amazoncorretto-8 - -on: - push: - branches: - - main - paths: - - "amazoncorretto-8/**" - - .github/workflows/amazoncorretto-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "amazoncorretto-8/**" - - .github/workflows/amazoncorretto-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: amazoncorretto-8 - secrets: inherit diff --git a/.github/workflows/azulzulu-11-alpine.yml b/.github/workflows/azulzulu-11-alpine.yml deleted file mode 100644 index 3d144320..00000000 --- a/.github/workflows/azulzulu-11-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: azulzulu-11-alpine - -on: - push: - branches: - - main - paths: - - "azulzulu-11-alpine/**" - - .github/workflows/azulzulu-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "azulzulu-11-alpine/**" - - .github/workflows/azulzulu-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: azulzulu-11-alpine - secrets: inherit diff --git a/.github/workflows/azulzulu-11-windowsservercore.yml b/.github/workflows/azulzulu-11-windowsservercore.yml deleted file mode 100644 index 69c8b1d3..00000000 --- a/.github/workflows/azulzulu-11-windowsservercore.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: azulzulu-11-windowsservercore - -on: - push: - paths: - - "azulzulu-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "azulzulu-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: azulzulu-11-windowsservercore - secrets: inherit diff --git a/.github/workflows/azulzulu-11.yml b/.github/workflows/azulzulu-11.yml deleted file mode 100644 index edf3ba56..00000000 --- a/.github/workflows/azulzulu-11.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: azulzulu-11 - -on: - push: - branches: - - main - paths: - - "azulzulu-11/**" - - .github/workflows/azulzulu-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "azulzulu-11/**" - - .github/workflows/azulzulu-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: azulzulu-11 - secrets: inherit diff --git a/.github/workflows/azulzulu-8-alpine.yml b/.github/workflows/azulzulu-8-alpine.yml deleted file mode 100644 index f21b5766..00000000 --- a/.github/workflows/azulzulu-8-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: azulzulu-8-alpine - -on: - push: - branches: - - main - paths: - - "azulzulu-8-alpine/**" - - .github/workflows/azulzulu-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "azulzulu-8-alpine/**" - - .github/workflows/azulzulu-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: azulzulu-8-alpine - secrets: inherit diff --git a/.github/workflows/azulzulu-8.yml b/.github/workflows/azulzulu-8.yml deleted file mode 100644 index 96d10310..00000000 --- a/.github/workflows/azulzulu-8.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: azulzulu-8 - -on: - push: - branches: - - main - paths: - - "azulzulu-8/**" - - .github/workflows/azulzulu-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "azulzulu-8/**" - - .github/workflows/azulzulu-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: azulzulu-8 - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-11-alpine.yml b/.github/workflows/eclipse-temurin-11-alpine.yml deleted file mode 100644 index 1183a16c..00000000 --- a/.github/workflows/eclipse-temurin-11-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-11-alpine - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-11-alpine/**" - - .github/workflows/eclipse-temurin-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-11-alpine/**" - - .github/workflows/eclipse-temurin-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-11-alpine - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-11-focal.yml b/.github/workflows/eclipse-temurin-11-focal.yml deleted file mode 100644 index a11f3636..00000000 --- a/.github/workflows/eclipse-temurin-11-focal.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-11-focal - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-11-focal/**" - - .github/workflows/eclipse-temurin-11-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-11-focal/**" - - .github/workflows/eclipse-temurin-11-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-11-focal - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-11.yml b/.github/workflows/eclipse-temurin-11.yml deleted file mode 100644 index 719f0791..00000000 --- a/.github/workflows/eclipse-temurin-11.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-11 - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-11/**" - - .github/workflows/eclipse-temurin-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-11/**" - - .github/workflows/eclipse-temurin-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-11 - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-8-alpine.yml b/.github/workflows/eclipse-temurin-8-alpine.yml deleted file mode 100644 index 7c249bfe..00000000 --- a/.github/workflows/eclipse-temurin-8-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-8-alpine - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-8-alpine/**" - - .github/workflows/eclipse-temurin-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-8-alpine/**" - - .github/workflows/eclipse-temurin-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-8-alpine - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-8-focal.yml b/.github/workflows/eclipse-temurin-8-focal.yml deleted file mode 100644 index 15148149..00000000 --- a/.github/workflows/eclipse-temurin-8-focal.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-8-focal - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-8-focal/**" - - .github/workflows/eclipse-temurin-8-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-8-focal/**" - - .github/workflows/eclipse-temurin-8-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-8-focal - secrets: inherit diff --git a/.github/workflows/eclipse-temurin-8.yml b/.github/workflows/eclipse-temurin-8.yml deleted file mode 100644 index 22f59eba..00000000 --- a/.github/workflows/eclipse-temurin-8.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: eclipse-temurin-8 - -on: - push: - branches: - - main - paths: - - "eclipse-temurin-8/**" - - .github/workflows/eclipse-temurin-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "eclipse-temurin-8/**" - - .github/workflows/eclipse-temurin-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: eclipse-temurin-8 - secrets: inherit diff --git a/.github/workflows/ibm-semeru-11-focal.yml b/.github/workflows/ibm-semeru-11-focal.yml deleted file mode 100644 index eb892bd6..00000000 --- a/.github/workflows/ibm-semeru-11-focal.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: ibm-semeru-11-focal - -on: - push: - branches: - - main - paths: - - "ibm-semeru-11-focal/**" - - .github/workflows/ibm-semeru-11-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "ibm-semeru-11-focal/**" - - .github/workflows/ibm-semeru-11-focal.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: ibm-semeru-11-focal - secrets: inherit diff --git a/.github/workflows/ibmjava-8.yml b/.github/workflows/ibmjava-8.yml deleted file mode 100644 index 465baa57..00000000 --- a/.github/workflows/ibmjava-8.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: ibmjava-8 - -on: - push: - branches: - - main - paths: - - "ibmjava-8/**" - - .github/workflows/ibmjava-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "ibmjava-8/**" - - .github/workflows/ibmjava-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: ibmjava-8 - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-11-alpine.yml b/.github/workflows/libericaopenjdk-11-alpine.yml deleted file mode 100644 index 2936ccb8..00000000 --- a/.github/workflows/libericaopenjdk-11-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-11-alpine - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-11-alpine/**" - - .github/workflows/libericaopenjdk-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-11-alpine/**" - - .github/workflows/libericaopenjdk-11-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-11-alpine - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-11-debian.yml b/.github/workflows/libericaopenjdk-11-debian.yml deleted file mode 100644 index dd0254bb..00000000 --- a/.github/workflows/libericaopenjdk-11-debian.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-11-debian - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-11-debian/**" - - .github/workflows/libericaopenjdk-11-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-11-debian/**" - - .github/workflows/libericaopenjdk-11-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-11-debian - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-11.yml b/.github/workflows/libericaopenjdk-11.yml deleted file mode 100644 index acb384d6..00000000 --- a/.github/workflows/libericaopenjdk-11.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-11 - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-11/**" - - .github/workflows/libericaopenjdk-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-11/**" - - .github/workflows/libericaopenjdk-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-11 - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-8-alpine.yml b/.github/workflows/libericaopenjdk-8-alpine.yml deleted file mode 100644 index 55fa63a9..00000000 --- a/.github/workflows/libericaopenjdk-8-alpine.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-8-alpine - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-8-alpine/**" - - .github/workflows/libericaopenjdk-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-8-alpine/**" - - .github/workflows/libericaopenjdk-8-alpine.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-8-alpine - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-8-debian.yml b/.github/workflows/libericaopenjdk-8-debian.yml deleted file mode 100644 index 16370ed6..00000000 --- a/.github/workflows/libericaopenjdk-8-debian.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-8-debian - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-8-debian/**" - - .github/workflows/libericaopenjdk-8-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-8-debian/**" - - .github/workflows/libericaopenjdk-8-debian.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-8-debian - secrets: inherit diff --git a/.github/workflows/libericaopenjdk-8.yml b/.github/workflows/libericaopenjdk-8.yml deleted file mode 100644 index d391d620..00000000 --- a/.github/workflows/libericaopenjdk-8.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: libericaopenjdk-8 - -on: - push: - branches: - - main - paths: - - "libericaopenjdk-8/**" - - .github/workflows/libericaopenjdk-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "libericaopenjdk-8/**" - - .github/workflows/libericaopenjdk-8.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: libericaopenjdk-8 - secrets: inherit diff --git a/.github/workflows/microsoft-openjdk-11-ubuntu.yml b/.github/workflows/microsoft-openjdk-11-ubuntu.yml deleted file mode 100644 index 32d22579..00000000 --- a/.github/workflows/microsoft-openjdk-11-ubuntu.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: microsoft-openjdk-11-ubuntu - -on: - push: - branches: - - main - paths: - - "microsoft-openjdk-11-ubuntu/**" - - .github/workflows/microsoft-openjdk-11-ubuntu.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "microsoft-openjdk-11-ubuntu/**" - - .github/workflows/microsoft-openjdk-11-ubuntu.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: microsoft-openjdk-11-ubuntu - secrets: inherit diff --git a/.github/workflows/openjdk-11-nanoserver.yml b/.github/workflows/openjdk-11-nanoserver.yml deleted file mode 100644 index 58a4106c..00000000 --- a/.github/workflows/openjdk-11-nanoserver.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: openjdk-11-nanoserver - -on: - push: - paths: - - "openjdk-11-nanoserver/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "openjdk-11-nanoserver/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: openjdk-11-nanoserver - secrets: inherit diff --git a/.github/workflows/openjdk-11-windowsservercore.yml b/.github/workflows/openjdk-11-windowsservercore.yml deleted file mode 100644 index 65e1450a..00000000 --- a/.github/workflows/openjdk-11-windowsservercore.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: openjdk-11-windowsservercore - -on: - push: - paths: - - "openjdk-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "openjdk-11-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: openjdk-11-windowsservercore - secrets: inherit diff --git a/.github/workflows/openjdk-8-nanoserver.yml b/.github/workflows/openjdk-8-nanoserver.yml deleted file mode 100644 index dd342c4f..00000000 --- a/.github/workflows/openjdk-8-nanoserver.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: openjdk-8-nanoserver - -on: - push: - paths: - - "openjdk-8-nanoserver/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "openjdk-8-nanoserver/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: openjdk-8-nanoserver - secrets: inherit diff --git a/.github/workflows/openjdk-8-windowsservercore.yml b/.github/workflows/openjdk-8-windowsservercore.yml deleted file mode 100644 index a147c5ab..00000000 --- a/.github/workflows/openjdk-8-windowsservercore.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: openjdk-8-windowsservercore - -on: - push: - paths: - - "openjdk-8-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bats" - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - pull_request: - paths: - - "openjdk-8-windowsservercore/**" - - "tests/**" - - github-action.ps1 - - "!tests/*.bash" - - "!tests/Dockerfile" - - .github/workflows/_template_windows.yml - -env: - DOCKER_PUSH: "true" - -jobs: - build: - uses: ./.github/workflows/_template_windows.yml - with: - directory: openjdk-8-windowsservercore - secrets: inherit diff --git a/.github/workflows/sapmachine-11.yml b/.github/workflows/sapmachine-11.yml deleted file mode 100644 index 6e19fecd..00000000 --- a/.github/workflows/sapmachine-11.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: sapmachine-11 - -on: - push: - branches: - - main - paths: - - "sapmachine-11/**" - - .github/workflows/sapmachine-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - pull_request: - paths: - - "sapmachine-11/**" - - .github/workflows/sapmachine-11.yml - - .github/workflows/_template.yml - - common.sh - - tags-for-dir.sh - - "tests/**" - - "!tests/*.ps*" - - "!tests/*.windows" - -jobs: - build: - uses: ./.github/workflows/_template.yml - with: - directory: sapmachine-11 - secrets: inherit diff --git a/README.md b/README.md index 1e965ede..0291fd95 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ COPY . . RUN mvn -B -e -o -T 1C verify # package without maven -FROM openjdk +FROM eclipse-temurin:17-jdk COPY --from=0 /usr/src/app/target/*.jar ./ ``` diff --git a/common.sh b/common.sh index a3b47d13..f23f0b4d 100755 --- a/common.sh +++ b/common.sh @@ -3,14 +3,14 @@ set -eu # Default values for 'latest' tag +latestMavenVersion='3.9.7' latest='' default_jdk=eclipse-temurin # All the JDKs and their 'latest' tags -parent_images=(openjdk eclipse-temurin ibmjava ibm-semeru amazoncorretto libericaopenjdk sapmachine graalvm-community oracle-graalvm) +parent_images=(eclipse-temurin ibm-semeru amazoncorretto libericaopenjdk sapmachine graalvm-community oracle-graalvm) declare -A jdk_latest=( ["jdk"]="17" - ["openjdk"]="" ["eclipse-temurin"]=$latest ["ibm-semeru"]="" ["amazoncorretto"]="17" @@ -29,7 +29,7 @@ declare -A extra_tags=( ) # All the directories that have images -all_dirs=(openjdk-* eclipse-temurin-* ibmjava-* ibm-semeru-* amazoncorretto-* azulzulu-* libericaopenjdk-* microsoft-* sapmachine-* graalvm-community-* oracle-graalvm-*) +all_dirs=(eclipse-temurin-* ibm-semeru-* amazoncorretto-* azulzulu-* libericaopenjdk-* microsoft-* sapmachine-* graalvm-community-* oracle-graalvm-*) ###################################################################################################################################### diff --git a/github-action.ps1 b/github-action.ps1 index ba75399c..f5772e23 100644 --- a/github-action.ps1 +++ b/github-action.ps1 @@ -21,7 +21,7 @@ Write-Host "Image: $dir" if(($dir.Contains('amazoncorretto')) -or ($dir.Contains('azulzulu'))) { $windowsDockerTag = 'ltsc2019' } -if(($dir.Contains('eclipse-temurin')) -or ($dir.Contains('openjdk'))) { +if($dir.Contains('eclipse-temurin')) { $windowsDockerTag = '1809' } diff --git a/publish.sh b/publish.sh index 9b84c2af..e7d89920 100755 --- a/publish.sh +++ b/publish.sh @@ -18,7 +18,7 @@ fi for dir in "${all_dirs[@]}"; do if [[ "$dir" == *"windows"* ]] || [[ "$dir" == *"nanoserver"* ]]; then - from=openjdk-11-windowsservercore + from=amazoncorretto-17-windowsservercore if [[ "$dir" != "$from" ]]; then cp $from/mvn-entrypoint.ps1 "$dir/" cp $from/settings-docker.xml "$dir/" diff --git a/tests/maven.Tests.ps1 b/tests/maven.Tests.ps1 index 03c66d5e..608f319f 100644 --- a/tests/maven.Tests.ps1 +++ b/tests/maven.Tests.ps1 @@ -1,6 +1,6 @@ BeforeAll { $SUT_IMAGE="maven" - $SUT_TAG="openjdk-8-windowsservercore" + $SUT_TAG="amazoncorretto-17-windowsservercore" if(![System.String]::IsNullOrWhiteSpace($env:TAG)) { $SUT_TAG=$env:TAG } diff --git a/tests/tests.bats b/tests/tests.bats index 76845a0a..b3298882 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -1,7 +1,7 @@ #!/usr/bin/env bats SUT_IMAGE=maven -SUT_TAG=${TAG:-openjdk-8} +SUT_TAG=${TAG:-eclipse-temurin-17} SUT_TEST_IMAGE=bats-maven-test load 'test_helper/bats-support/load' @@ -82,7 +82,6 @@ base_image=eclipse-temurin-17 [[ "$SUT_TAG" == *"-alpine" ]] || [[ "$SUT_TAG" == "amazoncorretto-"* ]] || [[ "$SUT_TAG" == "azulzulu-"* ]] || - [[ "$SUT_TAG" == "ibmjava-"* ]] || [[ "$SUT_TAG" == "libericaopenjdk-"* ]] || [[ "$SUT_TAG" == *"graalvm"* ]] ); then @@ -117,7 +116,6 @@ base_image=eclipse-temurin-17 if ! ( [[ "$SUT_TAG" == libericaopenjdk-? ]] || [[ "$SUT_TAG" == libericaopenjdk-?? ]] || - [[ "$SUT_TAG" == openjdk-?? ]] || [[ "$SUT_TAG" == *"oracle"* ]] ); then [ $status -eq 0 ] @@ -136,7 +134,6 @@ base_image=eclipse-temurin-17 if ! ( [[ "$SUT_TAG" == "amazoncorretto-"* ]] || [[ "$SUT_TAG" == libericaopenjdk-*-debian ]] || - [[ "$SUT_TAG" == openjdk-?? ]] || [[ "$SUT_TAG" == *"graalvm"* ]] ); then @@ -155,7 +152,6 @@ base_image=eclipse-temurin-17 [[ "$SUT_TAG" == amazoncorretto-*-al2023 ]] || [[ "$SUT_TAG" == libericaopenjdk-? ]] || [[ "$SUT_TAG" == libericaopenjdk-?? ]] || - [[ "$SUT_TAG" == openjdk-?? ]] || [[ "$SUT_TAG" == *"graalvm"* ]] ); then [ $status -eq 0 ]