diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ff482d71d2..aed145d2e13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,12 +64,20 @@ jobs: fail-fast: true matrix: # No need to run 'cftests-junit-jdk21' on JDK 21. - script: ['typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'jspecify-conformance', 'jspecify-reference-checker'] + script: ['typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'jspecify-conformance', 'jspecify-reference-checker', 'misc'] java_version: [21] env: JAVA_VERSION: ${{ matrix.java_version }} steps: - uses: actions/checkout@v4 + if: matrix.script != 'misc' + with: + fetch-depth: 1 + - uses: actions/checkout@v4 + if: matrix.script == 'misc' + with: + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java_version }} uses: actions/setup-java@v4 with: @@ -80,7 +88,17 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 - + # Setup for misc tests + - name: Install misc dependencies + if: matrix.script == 'misc' + run: | + sudo apt install -y shellcheck devscripts python3-pip \ + texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ + autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ + libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ + libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ + texlive-font-utils texlive-fonts-recommended texlive-latex-recommended + pip install black flake8 html5validator - name: Run test script checker/bin-devel/test-${{ matrix.script }} run: ./checker/bin-devel/test-${{ matrix.script }}.sh @@ -94,7 +112,7 @@ jobs: fail-fast: true matrix: # jspecify-conformance and jspecify-reference-checker only tested on JDK 21. - script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2'] + script: ['cftests-junit', 'cftests-nonjunit', 'cftests-junit-jdk21', 'typecheck-part1', 'typecheck-part2', 'guava', 'plume-lib', 'daikon-part1', 'daikon-part2', 'misc'] # JDK 21 used by sanity before java: [{version: '8', experimental: false}, {version: '11', experimental: false}, @@ -106,6 +124,14 @@ jobs: continue-on-error: ${{ matrix.java.experimental }} steps: - uses: actions/checkout@v4 + if: matrix.script != 'misc' + with: + fetch-depth: 1 + - uses: actions/checkout@v4 + if: matrix.script == 'misc' + with: + # CI diff needs more history - 0 fetches all history. + fetch-depth: 0 - name: Set up JDK ${{ matrix.java.version }} uses: actions/setup-java@v4 with: @@ -124,7 +150,17 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.2 - + # Setup for misc tests + - name: Install misc dependencies + if: matrix.script == 'misc' + run: | + sudo apt install -y shellcheck devscripts python3-pip \ + texlive-latex-base texlive-latex-extra latexmk librsvg2-bin \ + autoconf dia hevea latexmk libasound2-dev rsync pdf2svg \ + libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ + libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ + texlive-font-utils texlive-fonts-recommended texlive-latex-recommended + pip install black flake8 html5validator - name: Setup Bazel uses: bazel-contrib/setup-bazel@0.10.0 if: matrix.script == 'cftests-nonjunit' diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 068eb5090d3..00000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,75 +0,0 @@ -# Workaround for https://status.dev.azure.com/_event/179641421 -trigger: - branches: - include: - - '*' -pr: - branches: - include: - - '*' - -jobs: - -# Unlimited fetchDepth for misc_jobs, because of need to make contributors.tex -- job: misc_jdk8 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk8-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk11 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk11-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk17 - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk17-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -- job: misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk21-plus:latest - steps: - - checkout: self - - bash: ./checker/bin-devel/test-misc.sh - displayName: test-misc.sh -# Disable until JDK 22 is stable -# - job: misc_jdk_latest -# dependsOn: -# # - canary_jobs -# - misc_jdk21 -# pool: -# vmImage: 'ubuntu-latest' -# container: wmdietl/cf-ubuntu-jdk-latest-plus:latest -# steps: -# - checkout: self -# - bash: ./checker/bin-devel/test-misc.sh -# displayName: test-misc.sh -- job: misc_jdk_next - # dependsOn: - # - misc_jdk21 - pool: - vmImage: 'ubuntu-latest' - container: wmdietl/cf-ubuntu-jdk-next-plus:latest - steps: - - checkout: self - # Run test, but do not cause overall failure - - bash: ./checker/bin-devel/test-misc.sh - continueOnError: true - displayName: test-misc.sh