Re-arrange test setup

ponylang · Nov 6, 2023 · 61f4d8e · 61f4d8e
1 parent c0a8975
commit 61f4d8e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 53 deletions.
diff --git a/.github/workflows/breakage-against-ponyc-latest.yml b/.github/workflows/breakage-against-ponyc-latest.yml
@@ -5,22 +5,14 @@ on:
  types: [shared-docker-linux-builders-updated]
 
 jobs:
- release-vs-ponyc-main:
- name: Verify in release mode on Linux with most recent ponyc
+ linux:
+ name: Linux
  runs-on: ubuntu-latest
  container:
  image: ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:latest
  steps:
  - uses: actions/checkout@v3
- - name: Test with the most recent ponyc
- run: make ci config=release
-
- debug-vs-ponyc-main:
- name: Verify in debug mode on Linux with most recent ponyc
- runs-on: ubuntu-latest
- container:
- image: ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:latest
- steps:
- - uses: actions/checkout@v3
- - name: Test with the most recent ponyc
+ - name: config=debug
  run: make ci config=debug
+ - name: config=release
+ run: make ci config=release
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -28,75 +28,50 @@ jobs:
  - name: Verify CHANGELOG
  run: changelog-tool verify
 
- release-vs-ponyc-release:
- name: Verify release mode on Linux with most recent ponyc release
+ linux:
+ name: Linux
  runs-on: ubuntu-latest
  container:
  image: ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:release
  steps:
  - uses: actions/checkout@v3
- - name: Test with the most recent ponyc release
- run: make ci config=release
-
- debug-vs-ponyc-release:
- name: Verify debug mode on Linux with most recent ponyc release
- runs-on: ubuntu-latest
- container:
- image: ghcr.io/ponylang/shared-docker-ci-x86-64-unknown-linux-builder:release
- steps:
- - uses: actions/checkout@v3
- - name: Test with the most recent ponyc release
+ - name: config=debug
  run: make ci config=debug
+ - name: config=release
+ run: make ci config=release
 
- macos-debug-vs-ponyc-release:
- name: Verify PR builds on macOS with most recent ponyc release
+ macos:
+ name: MacOS
  runs-on: macos-latest
  steps:
  - uses: actions/checkout@v3
  - name: install pony tools
  run: bash .ci-scripts/macOS-install-release-pony-tools.bash
- - name: Test with the most recent ponyc release
+ - name: config=debug
  run: |
  export PATH=/Users/runner/.local/share/ponyup/bin/:$PATH
  make ci config=debug
-
- macos-release-vs-ponyc-release:
- name: Verify PR builds on macOS with most recent ponyc release
- runs-on: macos-latest
- steps:
- - uses: actions/checkout@v3
- - name: install pony tools
- run: bash .ci-scripts/macOS-install-release-pony-tools.bash
- - name: Test with the most recent ponyc release
+ - name: config=release
  run: |
  export PATH=/Users/runner/.local/share/ponyup/bin/:$PATH
  make ci config=release
 
- windows-debug-vs-ponyc-release:
- name: Verify PR builds on Windows with most recent ponyc release
+ windows:
+ name: Windows
  runs-on: windows-2022
  steps:
  - uses: actions/checkout@v3
- - name: Test with most recent ponyc release
+ - name: Setup
  run: |
  Invoke-WebRequest https://dl.cloudsmith.io/public/ponylang/releases/raw/versions/latest/ponyc-x86-64-pc-windows-msvc.zip -OutFile C:\ponyc.zip;
  Expand-Archive -Force -Path C:\ponyc.zip -DestinationPath C:\ponyc;
  Invoke-WebRequest https://dl.cloudsmith.io/public/ponylang/releases/raw/versions/latest/corral-x86-64-pc-windows-msvc.zip -OutFile C:\corral.zip;
  Expand-Archive -Force -Path C:\corral.zip -DestinationPath C:\ponyc;
+ - name: config=debug
+ run: |
  $env:PATH = 'C:\ponyc\bin;' + $env:PATH;
  .\make.ps1 -Command test -Config Debug 2>&1;
-
-
- windows-release-vs-ponyc-release:
- name: Verify PR builds on Windows with most recent ponyc release
- runs-on: windows-2022
- steps:
- - uses: actions/checkout@v3
- - name: Test with most recent ponyc release
+ - name: config=release
  run: |
- Invoke-WebRequest https://dl.cloudsmith.io/public/ponylang/releases/raw/versions/latest/ponyc-x86-64-pc-windows-msvc.zip -OutFile C:\ponyc.zip;
- Expand-Archive -Force -Path C:\ponyc.zip -DestinationPath C:\ponyc;
- Invoke-WebRequest https://dl.cloudsmith.io/public/ponylang/releases/raw/versions/latest/corral-x86-64-pc-windows-msvc.zip -OutFile C:\corral.zip;
- Expand-Archive -Force -Path C:\corral.zip -DestinationPath C:\ponyc;
  $env:PATH = 'C:\ponyc\bin;' + $env:PATH;
  .\make.ps1 -Command test -Config Release 2>&1;