Skip to content

Commit

Permalink
ci: Remove unnecessary vendor prefix from cross-unix
Browse files Browse the repository at this point in the history
vendor/dkml-compiler/ was from when cross-unix CI job was part of a parent project, not the dkml-compiler project.
  • Loading branch information
jonahbeckford committed Sep 12, 2024
1 parent 89d08a5 commit 3d34a8e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cross-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@ jobs:
os: macos-latest
targetabi: darwin_arm64
targetbits: 64
ocamlconfigure: vendor/dkml-compiler/env/standard-compiler-env-to-ocaml-configure-env.sh
ocamlconfigure: env/standard-compiler-env-to-ocaml-configure-env.sh
expectfile: Mach-O 64-bit executable arm64

- name: "[android] aarch64 on [linux] x86_64"
hostabi: linux_x86_64
os: ubuntu-latest
targetabi: android_arm64v8a
targetbits: 64
ocamlconfigure: vendor/dkml-compiler/env/github-actions-ci-to-ocaml-configure-env.sh
ocamlconfigure: env/github-actions-ci-to-ocaml-configure-env.sh
expectfile: ELF 64-bit LSB shared object, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /system/bin/linker64, with debug_info, not stripped

- name: "[android] armv7a on [linux] x86"
hostabi: linux_x86
os: ubuntu-latest
targetabi: android_arm32v7a
targetbits: 32
ocamlconfigure: vendor/dkml-compiler/env/github-actions-ci-to-ocaml-configure-env.sh
ocamlconfigure: env/github-actions-ci-to-ocaml-configure-env.sh
expectfile: ELF 32-bit LSB shared object, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /system/bin/linker, with debug_info, not stripped

- name: "[android] x86_64 on [linux] x86_64"
hostabi: linux_x86_64
os: ubuntu-latest
targetabi: android_x86_64
targetbits: 64
ocamlconfigure: vendor/dkml-compiler/env/github-actions-ci-to-ocaml-configure-env.sh
ocamlconfigure: env/github-actions-ci-to-ocaml-configure-env.sh
expectfile: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, interpreter /system/bin/linker64, with debug_info, not stripped

name: ${{ matrix.name }}
Expand Down Expand Up @@ -84,13 +84,13 @@ jobs:
# ================ Build ================
- name: Setup ${{ env.BUILD_TYPE }} OCaml
run: |
vendor/dkml-compiler/src/r-c-ocaml-1-setup.sh \
src/r-c-ocaml-1-setup.sh \
-d . \
-t "${{ env.DIST_DIR }}" \
-v "${{ env.OCAML_GIT_REV }}" \
-e "${{ matrix.hostabi }}" \
-a "${{ matrix.targetabi }}=${{ matrix.ocamlconfigure }}" \
-k vendor/dkml-compiler/env/standard-compiler-env-to-ocaml-configure-env.sh
-k env/standard-compiler-env-to-ocaml-configure-env.sh
- name: Build ${{ env.BUILD_TYPE }} OCaml for host ${{ matrix.hostabi }} ABI
run: cd "${{ env.DIST_DIR }}" && share/dkml/repro/100co/vendor/dkml-compiler/src/r-c-ocaml-2-build_host-noargs.sh
Expand Down

0 comments on commit 3d34a8e

Please sign in to comment.