Merge branch 'trunk' into runarorama/avroMagic

Author: runarorama

.github/workflows/bundle-ucm.yaml

@@ -1,7 +1,6 @@
 name: bundle ucm
 
 # build optimized ucm
-# package racket lib
 # build/dist unison-runtime
 
 on:
@@ -12,9 +11,6 @@ on:
         type: string
         required: true
 
-env:
-  racket_version: "8.17"
-
 defaults:
   run:
     shell: bash
@@ -99,115 +95,9 @@ jobs:
           payload: |
               text: "build-ucm failed on ${{ github.ref }}. See details: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} cc <@UF924D5S7>"
 
-  package-racket-lib:
-    strategy:
-      matrix:
-        os: [ubuntu-24.04]
-    needs: build-ucm
-    name: package racket lib
-    runs-on: ${{matrix.os}}
-    steps:
-      - name: set up environment
-        run: |
-          echo "ucm=${{ runner.temp }}/unison" >> $GITHUB_ENV
-      - name: download racket `unison` source
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          ref: ${{inputs.ref}}
-      - name: download ucm artifact
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
-        with:
-          name: unison-${{matrix.os}}
-          path: ${{ runner.temp }}
-      - name: generate source
-        run: |
-          chmod +x ${{ env.ucm }}
-          ${{ env.ucm }} transcript unison-src/transcripts-manual/gen-racket-libs.md
-      - name: install racket
-        uses: unisonweb/actions/racket/install@main
-        with:
-          version: ${{env.racket_version}}
-      - name: create racket lib
-        run: |
-          raco pkg create scheme-libs/racket/unison
-          ls -l scheme-libs/racket/unison.zip{,.CHECKSUM}
-      - name: upload racket lib
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        with:
-          name: racket-lib
-          path: |
-            scheme-libs/racket/unison.zip
-            scheme-libs/racket/unison.zip.CHECKSUM
-          if-no-files-found: error
-      - name: report errors
-        if: github.ref == 'refs/heads/trunk' && failure()
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # https://github.com/slackapi/slack-github-action/releases/tag/v2.0.0
-        with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
-          webhook-type: incoming-webhook
-          payload: |
-              text: "package-racket-lib failed on ${{ github.ref }}. See details: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} cc <@UF924D5S7>"
-
-  build-dist-unison-runtime:
-    needs: package-racket-lib
-    name: build unison-runtime
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-24.04
-          # - ubuntu-24.04-arm # no racket for arm linux
-          - macos-13 # intel
-          - macos-14 # apple silicon
-          - windows-2025
-          # - windows-11-arm
-    runs-on: ${{matrix.os}}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          ref: ${{inputs.ref}}
-      - name: download racket lib
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
-        with:
-          name: racket-lib
-          path: scheme-libs/racket/
-      - name: Cache Racket dependencies
-        id: cache-racket-deps
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
-        with:
-          path: |
-            ~/.cache/racket
-            ~/.local/share/racket
-            ~/Library/Racket/${{env.racket_version}}
-          # This isn't right because unison.zip is going to include different dates each time.
-          # Maybe we can unpack it and hash the contents.
-          key: ${{matrix.os}}-racket-${{env.racket_version}}-${{hashFiles('scheme-libs/racket/unison.zip')}}
-      - name: install racket
-        uses: unisonweb/actions/racket/install@main
-        with:
-          version: ${{env.racket_version}}
-      - name: install unison racket lib
-        if: steps.cache-racket-deps.outputs.cache-hit != 'true'
-        run: |
-          raco pkg install --auto --skip-installed scheme-libs/racket/unison.zip && \
-            raco pkg update --auto scheme-libs/racket/unison.zip
-      - name: build unison-runtime
-        run: |
-          raco exe --embed-dlls --orig-exe scheme-libs/racket/unison-runtime.rkt
-          mkdir runtime
-          if [[ ${{runner.os}} = 'Windows' ]]; then exe=".exe"; else exe=""; fi
-          raco distribute runtime scheme-libs/racket/unison-runtime$exe
-          ls -l runtime/
-      - name: upload unison-runtime
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        with:
-          name: unison-runtime-${{matrix.os}}
-          path: runtime/
-          if-no-files-found: error
-
   bundle:
-    name: bundle ucm, jit, and ui
-    needs: [build-ucm, package-racket-lib, build-dist-unison-runtime]
+    name: bundle ucm and ui
+    needs: [build-ucm]
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
@@ -219,9 +109,6 @@ jobs:
           - macos-14
           - windows-2025
           # - windows-11-arm
-        include:
-          - os: ubuntu-24.04-arm
-            nojit: true
     steps:
       - name: set up environment
         run: |
@@ -236,24 +123,6 @@ jobs:
           path: ${{env.staging_dir}}/unison/
       - name: restore permissions on ucm
         run: chmod +x ${{env.staging_dir}}/unison/unison
-      - name: download racket lib
-        if: (!matrix.nojit)
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
-        with:
-          name: racket-lib
-          path: ${{env.staging_dir}}/racket/
-      - name: download unison-runtime
-        if: (!matrix.nojit)
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
-        with:
-          name: unison-runtime-${{matrix.os}}
-          path: ${{env.staging_dir}}/runtime
-      - name: restore permissions on unison-runtime
-        # here we have the `if:` not because of the missing .exe on Windows,
-        # nor the lack of need to chmod, but because /runtime/bin/ probably doesn't exist
-        # due to differences in `raco distribute` on Windows vs macOS and Linux.
-        if: runner.os != 'Windows' && !matrix.nojit
-        run: chmod +x ${{env.staging_dir}}/runtime/bin/unison-runtime
       - name: download latest unison-local-ui
         run: |
           curl -L -o /tmp/unisonLocal.zip \
@@ -269,7 +138,7 @@ jobs:
             #!/bin/bash
             unison_root="$(dirname "$(readlink -f "$0")")"
             export UCM_WEB_UI="${unison_root}/ui"
-            "${unison_root}/unison/unison" --runtime-path "${unison_root}/runtime/bin/unison-runtime" "$@"
+            "${unison_root}/unison/unison" "$@"
       - name: create startup script (Windows)
         if: runner.os == 'Windows'
         uses: 1arp/create-a-file-action@29bab1af4675373aad48a2157c09f1917f85f008 # 0.4.4
@@ -279,7 +148,7 @@ jobs:
           content: |
             @echo off
             SET UCM_WEB_UI=%~dp0ui
-            "%~dp0unison\unison.exe" --runtime-path "%~dp0runtime\unison-runtime.exe" %*
+            "%~dp0unison\unison.exe" %*
       - name: package everything together
         run: |
           if [[ ${{runner.os}} = 'Windows' ]]; then