Skip to content

Commit

Permalink
Merge branch 'd-scripts2': Convert CI setup script from bash to D.
Browse files Browse the repository at this point in the history
  • Loading branch information
Abscissa committed May 31, 2018
1 parent 8d77497 commit 0953729
Show file tree
Hide file tree
Showing 20 changed files with 295 additions and 121 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -24,3 +24,5 @@ ddoc/packageVersion.ddoc
source/mysql/packageVersion.d

/unit-threaded-*

/run_tests_bin
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,7 +7,7 @@ addons:
packages: [ libevent-dev ]

install: $DMD -ofci_setup ci_setup.d && ./ci_setup
script: ./run-tests
script: ./run_tests --mode=combined

matrix:
include:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,7 @@ v2.3.0 - TBD
Fix metadata tests on MariaDB 10.2 and 10.3
- **Internal:** Rework travis config and scripts, including:
- General cleanup.
- Convert test scripts from bash/batch to D.
- Testing on more versions of MariaDB server.
- [#173](https://github.com/mysql-d/mysql-native/issues/173):
Support for per-job `dub.selections.json` overrides (needed for testing on DMD 2.079+).
Expand Down
2 changes: 1 addition & 1 deletion ci_setup.d
Expand Up @@ -24,7 +24,7 @@ void main()
{
auto dmdZip = "dmd.2.076.0."~environment["TRAVIS_OS_NAME"]~".zip";
spawnShell("wget http://downloads.dlang.org/releases/2017/"~dmdZip).wait;
spawnShell("unzip -d local-dmd "~dmdZip).wait;
spawnShell("unzip -q -d local-dmd "~dmdZip).wait;
}

// MySQL is not installed by default on OSX build agents
Expand Down
2 changes: 1 addition & 1 deletion dub.sdl
@@ -1,7 +1,7 @@
name "mysql-native"
description "A native MySQL driver implementation based on Steve Teale's original"
license "BSL-1.0"
copyright "Copyright (c) 2011-2017 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
copyright "Copyright (c) 2011-2018 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
authors "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky"

dependency "vibe-d:core" version=">=0.7.32 <0.9.0-0" optional=true
Expand Down
19 changes: 0 additions & 19 deletions find-rdmd.sh

This file was deleted.

4 changes: 0 additions & 4 deletions run-core-phobos-tests

This file was deleted.

39 changes: 0 additions & 39 deletions run-phobos-tests

This file was deleted.

4 changes: 0 additions & 4 deletions run-phobos-tests-ut

This file was deleted.

14 changes: 0 additions & 14 deletions run-phobos-tests-ut.bat

This file was deleted.

7 changes: 0 additions & 7 deletions run-phobos-tests.bat

This file was deleted.

3 changes: 0 additions & 3 deletions run-tests

This file was deleted.

2 changes: 0 additions & 2 deletions run-tests.bat

This file was deleted.

10 changes: 0 additions & 10 deletions run-vibe-tests

This file was deleted.

4 changes: 0 additions & 4 deletions run-vibe-tests-ut

This file was deleted.

6 changes: 0 additions & 6 deletions run-vibe-tests-ut.bat

This file was deleted.

6 changes: 0 additions & 6 deletions run-vibe-tests.bat

This file was deleted.

9 changes: 9 additions & 0 deletions run_tests
@@ -0,0 +1,9 @@
#!/bin/sh

# Compile using $DMD if it exists, otherwise use dmd
if [ -z "$DMD" ]; then
DMD=dmd
fi

echo "DMD=$DMD"
$DMD -ofrun_tests_bin run_tests.d && ./run_tests_bin "$@"
7 changes: 7 additions & 0 deletions run_tests.bat
@@ -0,0 +1,7 @@
@echo off

rem Compile using $DMD if it exists, otherwise use dmd
if not "%DMD%" == "" set DMD=dmd

echo DMD=%DMD%
%DMD% -ofrun_tests_bin run_tests.d && run_tests_bin %*

0 comments on commit 0953729

Please sign in to comment.