From 7b3b6605c13f28ab302e934e938aa36c74488cdc Mon Sep 17 00:00:00 2001
From: Carl Gay <carlgay@gmail.com>
Date: Thu, 29 Feb 2024 18:50:30 -0500
Subject: [PATCH] Default to dylan-tool@0.11.0

---
 .github/workflows/build-and-test.yml | 40 ++++++++++++++++++----------
 action.yml                           | 16 ++++-------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b81108b..35c4b2b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -13,7 +13,8 @@ on:
     branches:
       - main
 
-  # This enables the Run Workflow button on the Actions tab.
+  # This enables the Run Workflow button here:
+  # https://github.com/dylan-lang/install-dylan-tool/actions/workflows/build-and-test.yml
   workflow_dispatch:
 
 jobs:
@@ -21,24 +22,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: dylan-lang/install-dylan-tool@main
-
-      - name: Create workspace
-        run: |
-          ./dylan new workspace pc
-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           repository: dylan-lang/pacman-catalog
-          path: pc/pacman-catalog
+
+      - uses: dylan-lang/install-dylan-tool@update-version
+
+      - name: debug A
+        run: |
+          echo "PATH=${PATH}"
+          pwd
+          find .. -maxdepth 2
+          ls -l ..
+          dylan version
 
       - name: Build pacman-catalog-test-suite
         run: |
-          cd pc
-          DYLAN_CATALOG=./pacman-catalog ../dylan update
-          ../dylan-compiler -build -jobs 3 pacman-catalog-test-suite
+          echo "PATH=${PATH}"
+          pwd
+          find .. -maxdepth 2
+          ls -l ..
+          DYLAN_CATALOG=. ../dylan update
+          dylan build pacman-catalog-test-suite
 
       - name: Run pacman-catalog-test-suite
         run: |
-          cd pc
-          DYLAN_CATALOG=./pacman-catalog _build/bin/pacman-catalog-test-suite
+          DYLAN_CATALOG=. _build/bin/pacman-catalog-test-suite --report surefire --report-file _build/pacman-catalog-tests.xml
+
+      - name: Publish test report
+        if: success() || failure()
+        uses: mikepenz/action-junit-report@v4
+        with:
+          report_paths: '**/_build/*-tests.xml'
diff --git a/action.yml b/action.yml
index 1a9a204..6a26509 100644
--- a/action.yml
+++ b/action.yml
@@ -8,14 +8,14 @@ inputs:
   tag:
     required: false
     type: string
-    default: v0.8.0
+    default: v0.11.0
 
 runs:
   using: composite
   steps:
     - uses: dylan-lang/install-opendylan@v3
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: dylan-lang/dylan-tool
         submodules: recursive
@@ -23,15 +23,9 @@ runs:
         # Must be under ${GITHUB_WORKSPACE}. We mv this below.
         path: dylan-tool
 
-    - name: Build dylan-tool
+    - name: Build and install dylan-tool
       shell: bash
       run: |
-        TOP=$(realpath ${GITHUB_WORKSPACE}/..)
-        cd ${TOP}
-        # Remove the link install-opendylan@v3 creates itself.
-        rm -f dylan
-        mv ${GITHUB_WORKSPACE}/dylan-tool .
-        DYLAN=${TOP} make -C dylan-tool install
-        ln -s install/dylan-tool/bin/dylan-tool-app dylan
+        DYLAN=${GITHUB_WORKSPACE}/dylan-tool make -C dylan-tool install
         # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path
-        echo "${PWD}" >> ${GITHUB_PATH}
+        echo "${GITHUB_WORKSPACE}/dylan-tool/install/bin" >> ${GITHUB_PATH}