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
17 changes: 16 additions & 1 deletion .ci-macosx.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
#!/bin/sh

set -e
set -ex

sw_vers
system_profiler SPSoftwareDataType
uname -a

brew update

# homebrew fails to upgrade python due to unlinking failure
# (cf. https://github.com/actions/setup-python/issues/577 )
rm -f /usr/local/bin/2to3
rm -f /usr/local/bin/idle3
rm -f /usr/local/bin/pydoc3
rm -f /usr/local/bin/python3
rm -f /usr/local/bin/python3-config
rm -f /usr/local/bin/2to3-3.11
rm -f /usr/local/bin/idle3.11
rm -f /usr/local/bin/pydoc3.11
rm -f /usr/local/bin/python3.11
rm -f /usr/local/bin/python3.11-config
brew upgrade

brew install pkg-config
brew install opam
brew install libev
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Docker images
run: "make docker-images"
- name: Run learn-ocaml build on demo-repository
Expand All @@ -43,7 +43,7 @@ jobs:
USE_CLIENT_IMAGE: 'true'
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Docker images
run: "make docker-images"
- name: Pull server_image
Expand All @@ -66,7 +66,7 @@ jobs:
- 'Dockerfile.test-server'
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run docker build
run: 'file=${{ matrix.dockerfile }} && docker build -t "learn-ocaml-${file#*.}" -f "$file" .'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
runs-on: macos-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build learn-ocaml
run: 'sh .ci-macosx.sh'
6 changes: 3 additions & 3 deletions .github/workflows/deploy-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
# https://github.com/docker/build-push-action/tree/releases/v1#readme
uses: docker/build-push-action@v1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
steps:
- name: Check out the repo
# Mandatory step (otherwise, hub raises "fatal: Not a git repository")
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Download workflow artifacts
# cf. https://github.com/actions/download-artifact/issues/3
uses: dawidd6/action-download-artifact@v2
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup bot user
run: |
git config --global user.email "[email protected]"
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
id: tag
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
Expand All @@ -154,7 +154,7 @@ jobs:
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
id: tag
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
Expand All @@ -178,7 +178,7 @@ jobs:
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
id: tag
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Push to Docker Hub
# https://github.com/docker/build-push-action/tree/releases/v1#readme
uses: docker/build-push-action@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# we could use an env var, albeit it would be less convenient
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build learn-ocaml-compilation
run: 'docker build -t learn-ocaml-compilation --target=compilation .'
- name: 'Build ${{ matrix.arch_dir }}.zip'
Expand All @@ -45,7 +45,7 @@ jobs:
# we could use an env var, albeit it would be less convenient
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build the binaries
run: |
./scripts/static-build.sh
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
# we could use an env var, albeit it would be less convenient
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Show OS version
run: |
sw_vers
Expand Down