Skip to content

Commit

Permalink
Add GitHub CI (#5)
Browse files Browse the repository at this point in the history
* Update build script

- Use bash as pushd is not valid for sh

- Also reset glslang.y

- Use make -j (with number of cores)

* Update build.s to take configs as param

* Add initial github CI setup

* Fix gh actions build

- Use docker-compose for building and running

* Checkout submodules from gh-actions

* Add very basic jest test to CI

* Install deps during CI build

- Need to install jest before using it

* Fix CI tests

- Have to build node-devel twice to get right output (without import.meta)

- Added tests from helper.mjs
  • Loading branch information
pjoe authored Mar 24, 2020
1 parent db07d3c commit 2ff5b5d
Show file tree
Hide file tree
Showing 7 changed files with 3,794 additions and 10 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CI

on:
push:
branches: [master]
pull_request:
branches: [master]

env:
REPO_NAME: glslang.js
DOCKER_TAG: glslang.js:${{github.sha}}

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Build the Docker image
run: docker-compose build
- name: Build web-min-nocompute
run: docker-compose run --rm build ./build.sh web-min-nocompute
- name: Build node-devel
run: docker-compose run --rm build ./build.sh node-devel
- name: Build node-devel (again) #TODO: figure out why this is needed
run: docker-compose run --rm build ./build.sh node-devel
- name: Run tests
run: yarn install && yarn test
65 changes: 57 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/sh
#!/bin/bash
set -e
set -x

build() {
NUM_CORES=$(nproc)

build() {
type=$1
shift
args=$@
Expand All @@ -18,7 +20,7 @@ build() {
-DINSTALL_GTEST=OFF \
$args \
../../glslang
make glslang.js
make -j $(( $NUM_CORES )) glslang.js
popd
mkdir -p dist/$type
cp glslang.d.ts dist/$type/
Expand All @@ -40,15 +42,62 @@ update_grammar() {
}
reset_grammar() {
git -C glslang checkout glslang/MachineIndependent/glslang_tab.cpp{,.h}
git -C glslang checkout glslang/MachineIndependent/glslang.y
}

configs=$@
if [ $# -eq 0 ]; then
echo "Building all configs by default"
configs="\
web-min-nocompute\
web-devel-nocompute\
web-devel\
web-devel-onefile\
node-devel\
"
fi

update_grammar web
build web-min-nocompute -DENABLE_GLSLANG_JS=ON -DENABLE_GLSLANG_WEBMIN=ON -DENABLE_GLSLANG_WEBMIN_DEVEL=OFF
build web-devel-nocompute -DENABLE_GLSLANG_JS=ON -DENABLE_GLSLANG_WEBMIN=ON -DENABLE_GLSLANG_WEBMIN_DEVEL=ON
if [[ " $configs " =~ .*\ (web-min-nocompute)\ .* ]]; then
echo Building ${BASH_REMATCH[1]}
build web-min-nocompute\
-DENABLE_GLSLANG_JS=ON\
-DENABLE_GLSLANG_WEBMIN=ON\
-DENABLE_GLSLANG_WEBMIN_DEVEL=OFF
fi

if [[ " $configs " =~ .*\ (web-devel-nocompute)\ .* ]]; then
echo Building ${BASH_REMATCH[1]}
build web-devel-nocompute\
-DENABLE_GLSLANG_JS=ON\
-DENABLE_GLSLANG_WEBMIN=ON\
-DENABLE_GLSLANG_WEBMIN_DEVEL=ON
fi

update_grammar
build web-devel -DENABLE_GLSLANG_JS=ON -DENABLE_GLSLANG_WEBMIN=OFF
build web-devel-onefile -DENABLE_GLSLANG_JS=ON -DENABLE_GLSLANG_WEBMIN=OFF -DENABLE_EMSCRIPTEN_SINGLE_FILE=ON
build node-devel -DENABLE_GLSLANG_JS=ON -DENABLE_GLSLANG_WEBMIN=OFF -DENABLE_EMSCRIPTEN_ENVIRONMENT_NODE=ON
if [[ " $configs " =~ .*\ (web-devel)\ .* ]]; then
echo Building ${BASH_REMATCH[1]}
build web-devel\
-DENABLE_GLSLANG_JS=ON\
-DENABLE_GLSLANG_WEBMIN=OFF
fi

if [[ " $configs " =~ .*\ (web-devel-onefile)\ .* ]]; then
echo Building ${BASH_REMATCH[1]}
build web-devel-onefile\
-DENABLE_GLSLANG_JS=ON\
-DENABLE_GLSLANG_WEBMIN=OFF\
-DENABLE_EMSCRIPTEN_SINGLE_FILE=ON
fi

if [[ " $configs " =~ .*\ (node-devel)\ .* ]]; then
echo Building ${BASH_REMATCH[1]}
build node-devel\
-DENABLE_GLSLANG_JS=ON\
-DENABLE_GLSLANG_WEBMIN=OFF\
-DENABLE_EMSCRIPTEN_ENVIRONMENT_NODE=ON
fi

reset_grammar

wc -c dist/*/*
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ services:
args:
EMSDK_VERSION: "1.39.4"
working_dir: /app
command: bash ./build.sh
command: ./build.sh
volumes:
- ./:/app
191 changes: 191 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
// For a detailed explanation regarding each configuration property, visit:
// https://jestjs.io/docs/en/configuration.html

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// Respect "browser" field in package.json when resolving modules
// browser: false,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/tmp/jest_rs",

// Automatically clear mock calls and instances between every test
// clearMocks: false,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "json",
// "jsx",
// "ts",
// "tsx",
// "node"
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state between every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state between every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],
testMatch: [
"**/*.test.js"
]

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jasmine2",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,11 @@
"type": "git",
"url": "https://github.com/kainino0x/-webgpu-glslang.git"
},
"homepage": "https://github.com/kainino0x/-webgpu-glslang"
"homepage": "https://github.com/kainino0x/-webgpu-glslang",
"devDependencies": {
"jest": "^25.1.0"
},
"scripts": {
"test": "jest"
}
}
Loading

0 comments on commit 2ff5b5d

Please sign in to comment.