Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .azure/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ all default: azure-pipelines.yml
# TODO: all default: azure-pipelines.yml azure-pipelines-daily.yml

%: %.m4 defs.m4 jobs.m4
@chmod -f +w $@ || true
m4 $< > $@
@chmod -w $@

clean:
rm -f azure-pipelines.yml
31 changes: 15 additions & 16 deletions .azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
# * Everything not *_ubuntu_jdk25 or typecheck_*_jdk25 depends on canary_jobs.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk25.
# * Anything *_rockylinux_* depends on *_ubuntu_*.

# The remainder of jobs are run only if the canary_jobs pass.
- job: canary_jobs
dependsOn:
Expand Down Expand Up @@ -773,18 +772,18 @@ jobs:
- bash: ./scripts/test-kvasir.sh
displayName: test-kvasir.sh

## Enable this job to prioritize typechecking a single file, without waiting for other tests.
# - job: typecheck_onefile_jdk21
# pool:
# vmImage: 'ubuntu-latest'
# container: mdernst/daikon-ubuntu-jdk21-plus${{ variables.testingSuffix }}:latest
# timeoutInMinutes: 70
# steps:
# - checkout: self
# fetchDepth: 1
# - bash: |
# java -version
# javac -version
# displayName: show Java version
# - bash: ./scripts/test-typecheck-onefile.sh
# displayName: test-typecheck-onefile.sh
# ## Enable this job to prioritize typechecking a single file, without waiting for other tests.
# - job: typecheck_onefile_jdk21
# pool:
# vmImage: 'ubuntu-latest'
# container: mdernst/daikon-ubuntu-jdk21-plus${{ variables.testingSuffix }}:latest
# timeoutInMinutes: 70
# steps:
# - checkout: self
# fetchDepth: 1
# - bash: |
# java -version
# javac -version
# displayName: show Java version
# - bash: ./scripts/test-typecheck-onefile.sh
# displayName: test-typecheck-onefile.sh
77 changes: 38 additions & 39 deletions .azure/azure-pipelines.yml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,55 @@ include([defs.m4])dnl
trigger:
branches:
include:
- '*'
- '*'
pr:
branches:
include:
- '*'
- '*'

# variables:
# - name: testingSuffix
# value: -testing
variables:
- name: testingSuffix
value:
- name: testingSuffix
value:

jobs:

# The dependsOn clauses (in this file and in .circleci/config.yml) are:
# * Everything not *_ubuntu_jdk[]canary_version or typecheck_*_jdk[]canary_version depends on canary_jobs.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk25.
# * Anything *_rockylinux_* depends on *_ubuntu_*.

# The remainder of jobs are run only if the canary_jobs pass.
- job: canary_jobs
dependsOn:
- quick_[]canary_os[]_jdk[]canary_version
- nonquick_[]canary_os[]_jdk[]canary_version
- nontxt_[]canary_os[]_jdk[]canary_version
- misc_[]canary_os[]_jdk[]canary_version
- kvasir_[]canary_os[]_jdk[]canary_version
- typecheck_latest_[]canary_os[]_jdk[]canary_version
- typecheck_bundled_[]canary_os[]_jdk[]canary_version
pool:
vmImage: 'ubuntu-latest'
steps:
- checkout: none
- bash: true
# The dependsOn clauses (in this file and in .circleci/config.yml) are:
# * Everything not *_ubuntu_jdk[]canary_version or typecheck_*_jdk[]canary_version depends on canary_jobs.
# * Anything *_jdk8 or *_jdk11 or *_jdk17 or *_jdk21 depends on *_jdk25.
# * Anything *_rockylinux_* depends on *_ubuntu_*.
# The remainder of jobs are run only if the canary_jobs pass.
- job: canary_jobs
dependsOn:
- quick_[]canary_os[]_jdk[]canary_version
- nonquick_[]canary_os[]_jdk[]canary_version
- nontxt_[]canary_os[]_jdk[]canary_version
- misc_[]canary_os[]_jdk[]canary_version
- kvasir_[]canary_os[]_jdk[]canary_version
- typecheck_latest_[]canary_os[]_jdk[]canary_version
- typecheck_bundled_[]canary_os[]_jdk[]canary_version
pool:
vmImage: 'ubuntu-latest'
steps:
- checkout: none
- bash: true

include([jobs.m4])dnl

## Enable this job to prioritize typechecking a single file, without waiting for other tests.
# - job: typecheck_onefile_jdk21
# pool:
# vmImage: 'ubuntu-latest'
# container: mdernst/daikon-ubuntu-jdk21-plus${{ variables.testingSuffix }}:latest
# timeoutInMinutes: 70
# steps:
# - checkout: self
# fetchDepth: 1
# - bash: |
# java -version
# javac -version
# displayName: show Java version
# - bash: ./scripts/test-typecheck-onefile.sh
# displayName: test-typecheck-onefile.sh
# ## Enable this job to prioritize typechecking a single file, without waiting for other tests.
# - job: typecheck_onefile_jdk21
# pool:
# vmImage: 'ubuntu-latest'
# container: mdernst/daikon-ubuntu-jdk21-plus${{ variables.testingSuffix }}:latest
# timeoutInMinutes: 70
# steps:
# - checkout: self
# fetchDepth: 1
# - bash: |
# java -version
# javac -version
# displayName: show Java version
# - bash: ./scripts/test-typecheck-onefile.sh
# displayName: test-typecheck-onefile.sh
Loading