From c8446efd594dddf1e4d4b735c50d79d9347f5d27 Mon Sep 17 00:00:00 2001 From: Brady Pascoe <18705892+bpas247@users.noreply.github.com> Date: Tue, 3 Sep 2019 22:35:16 -0700 Subject: [PATCH 1/4] ci(actions): add mac and firefox to test configuration As per #179, the FireFox builds will likely not pass. This also comes with a change to make it more aligned with the React-Bootstrap testing configuration, by adding an additional step to build production files. --- .github/workflows/test.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6afc509c..c682cc61 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + browser: [ChromeHeadless, FirefoxHeadless] + os: [ubuntu-latest, windows-latest, macOS-latest] steps: - name: Checking out Repository uses: actions/checkout@v1 @@ -14,15 +15,26 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12.x + - name: Update Brew (macOS) + if: matrix.os == 'macOS-latest' + run: brew update + - name: Install Chrome (macOS) + if: matrix.os == 'macOS-latest' && matrix.browser == 'ChromeHeadless' + run: brew cask install google-chrome + - name: Install Firefox (macOS) + if: matrix.os == 'macOS-latest' && matrix.browser == 'FirefoxHeadless' + run: brew cask install firefox - name: Install Dependencies run: yarn bootstrap - name: Run Tests run: yarn test env: - BROWSER: ChromeHeadless + BROWSER: ${{ matrix.browser }} - name: Upload Test Coverage to CodeCov # Container actions can only run on linux containers, which is sad. if: matrix.os == 'ubuntu-latest' uses: codecov/codecov-action@v1.0.2 with: token: ${{ secrets.CODECOV_TOKEN }} + - name: Build Project + run: yarn build \ No newline at end of file From 4a3246a10cde4933a889e1c5d8623e333d0ce637 Mon Sep 17 00:00:00 2001 From: Brady Pascoe <18705892+bpas247@users.noreply.github.com> Date: Tue, 3 Sep 2019 22:39:38 -0700 Subject: [PATCH 2/4] fix(ci): incorrect indentation for build file --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c682cc61..d7136857 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,13 +17,13 @@ jobs: node-version: 12.x - name: Update Brew (macOS) if: matrix.os == 'macOS-latest' - run: brew update + run: brew update - name: Install Chrome (macOS) if: matrix.os == 'macOS-latest' && matrix.browser == 'ChromeHeadless' - run: brew cask install google-chrome + run: brew cask install google-chrome - name: Install Firefox (macOS) if: matrix.os == 'macOS-latest' && matrix.browser == 'FirefoxHeadless' - run: brew cask install firefox + run: brew cask install firefox - name: Install Dependencies run: yarn bootstrap - name: Run Tests From 63f1f18b73f1f238433b53509871529790d91725 Mon Sep 17 00:00:00 2001 From: Brady Pascoe <18705892+bpas247@users.noreply.github.com> Date: Tue, 3 Sep 2019 22:58:38 -0700 Subject: [PATCH 3/4] chore(deps): add missing dependency This is needed for the ci builds to be able to build on Firefox. --- package.json | 1 + yarn.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/package.json b/package.json index f5970714..289048b2 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,7 @@ "karma": "^4.2.0", "karma-chrome-launcher": "^3.0.0", "karma-coverage": "^2.0.1", + "karma-firefox-launcher": "^1.2.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.5", "karma-sinon-chai": "^2.0.2", diff --git a/yarn.lock b/yarn.lock index 37f3515c..b1734c73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5691,6 +5691,11 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-wsl@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.0.tgz#94369bbeb2249ef07b831b1b08590e686330ccbb" + integrity sha512-pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ== + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -5997,6 +6002,13 @@ karma-coverage@^2.0.1: minimatch "^3.0.0" source-map "^0.5.1" +karma-firefox-launcher@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz#64fe03dd10300f9754d48f9ebfbf31f6c94a200c" + integrity sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ== + dependencies: + is-wsl "^2.1.0" + karma-mocha-reporter@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560" From f0b6780ccc04266cb21d4e95dc6a6e502365d4d0 Mon Sep 17 00:00:00 2001 From: Brady Pascoe <18705892+bpas247@users.noreply.github.com> Date: Thu, 5 Sep 2019 09:57:08 -0700 Subject: [PATCH 4/4] chore(ci): attempting to re-trigger the CI build This commit doesn't add anything, as I'm attempting to re-trigger the CI build (since it errored out for an unknown bug). --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbbbf973..b931b4e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ on: - master pull_request: branches: - - master + - master jobs: test: name: Run Testing Suite