migrate from travis-ci to github actions (#61)

* migrate from travis-ci to github actions * update maintainer's guide with info on composer usage * fix hhvm running at wrong version * does this work * how about this * uhh how about this * support HHVM 4.80 * fix unit tests on 4.80 * fix lint errors * drop 4.56 from this branch
slackhq · Jan 5, 2021 · 6f18c3b · 6f18c3b
1 parent c2e22dc
commit 6f18c3b
Show file tree

Hide file tree

Showing 23 changed files with 187 additions and 87 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -0,0 +1,54 @@
+name: Continuous Integration
+on:
+  pull_request:
+jobs:
+  build:
+    name: HHVM ${{matrix.hhvm}} - ${{matrix.os}}
+    strategy:
+      # Run tests on all OS's and HHVM versions, even if one fails
+      fail-fast: false
+      matrix:
+        os: [ ubuntu ]
+        hhvm:
+          - '4.80'
+    runs-on: ${{matrix.os}}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Composer
+        run: .github/workflows/install-composer.sh --install-dir=${{runner.temp}}
+      - name: Install HHVM (apt)
+        if: matrix.os == 'ubuntu'
+        run: |
+          set -ex
+          export DEBIAN_FRONTEND=noninteractive
+          sudo apt-get update
+          sudo apt-get install -y software-properties-common apt-transport-https
+          sudo apt-key add .github/workflows/hhvm.gpg.key
+          if [ "${{matrix.hhvm}}" = "nightly" ]; then
+            sudo add-apt-repository https://dl.hhvm.com/ubuntu
+            sudo apt-get install -y hhvm-nightly
+          elif [ "${{matrix.hhvm}}" = "latest" ]; then
+            sudo add-apt-repository https://dl.hhvm.com/ubuntu
+            sudo apt-get install -y hhvm
+          else
+            DISTRO=$(lsb_release --codename --short)
+            sudo add-apt-repository \
+              "deb https://dl.hhvm.com/ubuntu ${DISTRO}-${{matrix.hhvm}} main"
+            sudo apt remove hhvm
+            sudo apt-get install -y hhvm
+          fi
+      - name: Inspect HHVM and Hack versions
+        run: |
+          hhvm --version
+          hh_client --version
+      - name: Create branch for version alias
+        run: git checkout -b CI_current_pull_request
+      - name: Install project dependencies
+        run: php ${{runner.temp}}/composer.phar install
+      - name: Typecheck
+        run: hh_client
+      - name: Run tests
+        run: vendor/bin/hacktest tests/
+      - name: Run lint
+        if: matrix.hhvm != 'nightly'
+        run: vendor/bin/hhast-lint
diff --git a/.github/workflows/hhvm.gpg.key b/.github/workflows/hhvm.gpg.key
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=3DTP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/.github/workflows/install-composer.sh b/.github/workflows/install-composer.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# From https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+
+EXPECTED_CHECKSUM="$(wget -q -O - https://composer.github.io/installer.sig)"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php "$@"
+RESULT=$?
+rm composer-setup.php
+exit $RESULT
diff --git a/.travis.sh b/.travis.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "hhvm/hhvm-autoload": "^2.0.4|^3"
   },
   "require-dev": {
-    "hhvm/hhast": "^4.0.5",
+    "hhvm/hhast": "^4.80",
     "facebook/fbexpect": "^2.2.0",
     "hhvm/hacktest": "^1.3|^2.0"
   }

diff --git a/maintainers_guide.md b/maintainers_guide.md
@@ -6,6 +6,17 @@ this project. If you use this package within your own software as is but don't p
 
 ## Tasks
 
+### Setup
+
+Install [Composer](https://getcomposer.org/) and PHP. Use PHP to run composer and install dependencies in this working copy. This will create and populate the `vendor/` directory. Note that composer cannot be run with HHVM.
+
+```
+# if composer installed locally
+/usr/bin/php composer.phar install
+# if installed globally
+/usr/bin/php /usr/local/bin/composer install
+```
+
 ### Testing
 
 Run unit tests locally using `vendor/bin/hacktest tests/`. Tests are also run automatically on all branches using [Travis CI](https://travis-ci.org/slackhq/hack-sql-fake).

diff --git a/src/AsyncMysql/AsyncMysqlClient.php b/src/AsyncMysql/AsyncMysqlClient.php
@@ -24,6 +24,7 @@ public static function setPoolsConnectionLimit(int $_limit): void {}
 		string $_password,
 		int $_timeout_micros = -1,
 		?\MySSLContextProvider $_ssl_provider = null,
+		int $_tcp_timeout_micros = 0,
 	): Awaitable<\AsyncMysqlConnection> {
 		return new AsyncMysqlConnection($host, $port, $dbname);
 	}

diff --git a/src/AsyncMysql/AsyncMysqlConnectionPool.php b/src/AsyncMysql/AsyncMysqlConnectionPool.php
@@ -31,6 +31,7 @@ public function reset(): void {
     string $_password,
     int $_timeout_micros = -1,
     string $_caller = '',
+    int $_tcp_timeout_micros = 0,
   ): Awaitable<AsyncMysqlConnection> {
     $this->connectionsRequest++;
     if (C\contains_key(static::$pool, $host)) {

diff --git a/src/BuildSchemaCLI.php b/src/BuildSchemaCLI.php
@@ -27,7 +27,7 @@ protected function getSupportedOptions(): vec<CLIOptions\CLIOption> {
 
 		if (C\is_empty($this->getArguments())) {
 			$program = $this->getArgv()[0];
-			await $terminal->getStdout()->writeAsync(<<<EOT
+			await $terminal->getStdout()->writeAllAsync(<<<EOT
 
 Usage: {$program} [--name DB_SCHEMA] [files...] > schema.hack
 
@@ -49,7 +49,7 @@ protected function getSupportedOptions(): vec<CLIOptions\CLIOption> {
 			if ($match === null) {
 				/* HHAST_IGNORE_ERROR[DontAwaitInALoop] */
 				await $terminal->getStderr()
-					->writeAsync("Expected file name matching [database_name].sql, {$file} does not match");
+					->writeAllAsync("Expected file name matching [database_name].sql, {$file} does not match");
 				return 1;
 			}
 
@@ -59,7 +59,7 @@ protected function getSupportedOptions(): vec<CLIOptions\CLIOption> {
 
 			if ($contents === false) {
 				/* HHAST_IGNORE_ERROR[DontAwaitInALoop] */
-				await $terminal->getStderr()->writeAsync("File could not be loaded: {$contents}");
+				await $terminal->getStderr()->writeAllAsync("File could not be loaded: {$contents}");
 				return 1;
 			}
 
@@ -105,7 +105,7 @@ protected function getSupportedOptions(): vec<CLIOptions\CLIOption> {
 			.
 			$generated;
 
-		await $terminal->getStdout()->writeAsync($generated);
+		await $terminal->getStdout()->writeAllAsync($generated);
 		return 0;
 	}
 }
diff --git a/src/Logger.php b/src/Logger.php
@@ -20,8 +20,8 @@ public static function log(Verbosity $verbosity, string $message): void {
 
 	protected static function write(string $message): void {
 		if (self::$handle is nonnull) {
-      /*HHAST_FIXME[DontUseAsioJoin]*/
-			\HH\Asio\join(self::$handle->writeAsync($message));
+			/*HHAST_FIXME[DontUseAsioJoin]*/
+			\HH\Asio\join(self::$handle->writeAllAsync($message));
 		} else {
 			\error_log($message);
 		}

diff --git a/src/Parser/CreateTableParser.php b/src/Parser/CreateTableParser.php
@@ -352,9 +352,7 @@ private function nextTokenIs(vec<string> $tokens, string $val): bool {
 		return Str\uppercase($tokens[0]) === $val;
 	}
 
-	private function parseCreateDefinition(
-		inout vec<string> $tokens,
-	): shape(
+	private function parseCreateDefinition(inout vec<string> $tokens): shape(
 		'fields' => vec<parsed_field>,
 		'indexes' => vec<parsed_index>,
 	) {
@@ -521,6 +519,9 @@ private function parseFieldOrKey(
 
 				# not currently handled
 				return;
+			default:
+				# any other tokens fall through to be parsed below
+				break;
 		}
 
 		$fields[] = $this->parseField($tokens);
@@ -881,8 +882,10 @@ private function extractTokens(string $sql, vec<(int, int)> $source_map): vec<st
 						# Extend the length of the first token to include everything
 						# up through the last in the sequence.
 						$j = $i + C\count($list) - 1;
-						$out_map[] =
-							tuple($source_map[$i][0], ($source_map[$j][0] - $source_map[$i][0]) + $source_map[$j][1]);
+						$out_map[] = tuple(
+							$source_map[$i][0],
+							($source_map[$j][0] - $source_map[$i][0]) + $source_map[$j][1],
+						);
 
 						$i = $j + 1;
 						$found = true;

diff --git a/tests/DeleteQueryTest.php b/tests/DeleteQueryTest.php
@@ -95,7 +95,7 @@ final class DeleteQueryTest extends HackTest {
 	public static async function beforeFirstTestAsync(): Awaitable<void> {
 		static::$conn = await SharedSetup::initAsync();
 		// block hole logging
-		Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+		Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
 	}
 
 	<<__Override>>

diff --git a/tests/InsertQueryTest.php b/tests/InsertQueryTest.php
@@ -15,7 +15,7 @@ final class InsertQueryTest extends HackTest {
     $pool = new AsyncMysqlConnectionPool(darray[]);
     static::$conn = await $pool->connect('example', 1, 'db1', '', '');
     // black hole logging
-    Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+    Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
   }
 
   <<__Override>>

diff --git a/tests/JSONFunctionTest.hack b/tests/JSONFunctionTest.hack
@@ -20,7 +20,7 @@ final class JSONFunctionTest extends HackTest {
     public static async function beforeFirstTestAsync(): Awaitable<void> {
         static::$conn = await SharedSetup::initAsync();
         // block hole logging
-        Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+        Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
     }
 
     <<__Override>>

diff --git a/tests/JoinQueryTest.php b/tests/JoinQueryTest.php
@@ -91,8 +91,9 @@ final class JoinQueryTest extends HackTest {
 
 	public async function testLeftJoin(): Awaitable<void> {
 		$conn = static::$conn as nonnull;
-		$results =
-			await $conn->query('SELECT id, table_4_id FROM table3 LEFT OUTER JOIN association_table ON id=table_3_id');
+		$results = await $conn->query(
+			'SELECT id, table_4_id FROM table3 LEFT OUTER JOIN association_table ON id=table_3_id',
+		);
 		expect($results->rows())->toBeSame(vec[
 			dict['id' => 1, 'table_4_id' => 1000],
 			dict['id' => 1, 'table_4_id' => 1001],
@@ -151,7 +152,7 @@ final class JoinQueryTest extends HackTest {
 	public static async function beforeFirstTestAsync(): Awaitable<void> {
 		static::$conn = await SharedSetup::initAsync();
 		// block hole logging
-		Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+		Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
 	}
 
 	<<__Override>>

diff --git a/tests/MultiQueryTest.php b/tests/MultiQueryTest.php
@@ -91,7 +91,7 @@ final class MultiQueryTest extends HackTest {
 	public static async function beforeFirstTestAsync(): Awaitable<void> {
 		static::$conn = await SharedSetup::initAsync();
 		// block hole logging
-		Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+		Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
 	}
 
 	<<__Override>>

diff --git a/tests/SQLFunctionTest.php b/tests/SQLFunctionTest.php
@@ -357,7 +357,7 @@ final class SQLFunctionTest extends HackTest {
 	public static async function beforeFirstTestAsync(): Awaitable<void> {
 		static::$conn = await SharedSetup::initAsync();
 		// block hole logging
-		Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+		Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
 	}
 
 	<<__Override>>

diff --git a/tests/SelectClauseTest.php b/tests/SelectClauseTest.php
@@ -13,7 +13,7 @@ final class SelectClauseTest extends HackTest {
 	public static async function beforeFirstTestAsync(): Awaitable<void> {
 		static::$conn = await SharedSetup::initAsync();
 		// block hole logging
-		Logger::setHandle(new \Facebook\CLILib\TestLib\StringOutput());
+		Logger::setHandle(new \HH\Lib\IO\MemoryHandle());
 	}
 
 	<<__Override>>