Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove links-mysql database driver #1178

Merged
merged 13 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from 7 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
72 changes: 0 additions & 72 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,78 +274,6 @@ jobs:
LINKS_MYSQL8_PORT: ${{ job.services.mysql.ports[3306] }}
shell: bash

links-mysql_mysql57:
strategy:
fail-fast: false
matrix:
os:
- ubuntu-18.04
ocaml-compiler:
- 4.14.1
- 5.0.0

runs-on: ${{ matrix.os }}

services:
mysql:
image: mysql:5.7
env:
MYSQL_USER: links
MYSQL_PASSWORD: links
MYSQL_ROOT_PASSWORD: links
MYSQL_DATABASE: links
MYSQL_ROOT_HOST: "%"
ports:
- 3306:3306
options: >-
--health-cmd="mysqladmin ping"
--health-interval=10s
--health-timeout=5s
--health-retries=3

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install system dependencies
run: sudo apt-get install -y libev-dev
shell: bash

- name: Use OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}

- run: opam install -y conf-libev

- name: Install Links dependencies
run: >-
opam install
./links.opam
./links-mysql.opam
--deps-only
--ignore-constraints-on=links

- name: Build Links from source
run: |
eval $(opam env)
make all-ci
shell: bash

- name: Run MySQL5.7 database testsuite
run: |
eval $(opam env)
./run-database-tests tests/database -d mysql
./run-database-tests tests/relational-lenses -d mysql
env:
# TODO(dhil): I do not know how to index into the
# environments of either service. Until we figure out how to
# do it, we will just duplicate information here.
LINKS_MYSQL_HOST: 127.0.0.1
LINKS_MYSQL_USER: links
LINKS_MYSQL_PASSWORD: links
LINKS_MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
shell: bash

js-runtime-lint:
strategy:
Expand Down
6 changes: 5 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Unreleased

List of changes since the latest release.

* The package `links-mysql`, based on the `mysql` opam package is no
longer supported. Instead, the package `links-mysql8`, based on the
`mysql8` package is provided, which also supports version of MySQL
prior to 8.

# 0.9.7

This release includes minor bug fixes, improvements, and a breaking
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ BUILD_DIR:=$(ROOT)/_build
BUILD=dune build
MAIN=links
SOURCES=$(MAIN)
DB_STABLE=links-postgresql,links-sqlite3,links-mysql
DB_EXPERIMENTAL=links-mysql8
DB_SOURCES=$(DB_STABLE),$(DB_EXPERIMENTAL)
DB_STABLE=links-postgresql,links-sqlite3,links-mysql8
DB_SOURCES=$(DB_STABLE)
# Note: this relies on lazy expansion of `SOURCES'.
COMMON_FLAGS=--only-packages $(SOURCES) --build-dir=$(BUILD_DIR)
DEV_FLAGS=$(COMMON_FLAGS) --profile=dev
Expand Down
12 changes: 0 additions & 12 deletions database/mysql-driver/dune

This file was deleted.

6 changes: 0 additions & 6 deletions database/mysql-driver/links_mysql_dependencies.json

This file was deleted.

Loading