From 9f24b45919b706a788412d32066ac665d14cc7b7 Mon Sep 17 00:00:00 2001 From: Pavlo Buidenkov Date: Fri, 25 Sep 2020 15:49:43 +0300 Subject: [PATCH] check actions test run, and change readme --- .github/workflows/test.yml | 119 +++++++++--------- README.md | 4 +- .../StepsOfStepper/IntermediateStep.tsx | 22 ++-- 3 files changed, 76 insertions(+), 69 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a918103..151530b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,74 +1,75 @@ -# name: build and test +name: build and test -# on: [pull_request] +on: [pull_request] -# # NPMRC_ADMIN_USER_AUTH_TOKEN +# NPMRC_ADMIN_USER_AUTH_TOKEN -# jobs: -# build-and-test: -# runs-on: ${{ matrix.os }} +jobs: + build-and-test: + runs-on: ${{ matrix.os }} -# strategy: -# matrix: -# os: [macos-10.14, windows-2019, ubuntu-18.04] + strategy: + matrix: + os: [macos-10.15, windows-2019, ubuntu-18.04] -# steps: -# - name: Check out Git repository -# uses: actions/checkout@v2.3.1 + steps: + - name: Check out Git repository + uses: actions/checkout@v2.3.1 -# - name: Install Node.js, NPM and Yarn -# uses: actions/setup-node@v1.4.2 -# with: -# node-version: 14 + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v1.4.2 + with: + node-version: 14 -# # - name: yarn install from npmjs registry -# # run: | -# # yarn install --no-lockfile -# # yarn install-client:nolockfile + # - name: yarn install from npmjs registry + # run: | + # yarn install --no-lockfile + # yarn install-client:nolockfile -# - name: Configure private AWS npm registry and install packages from it -# # if: ${{ failure() }} -# run: | -# npm config set registry https://packages.deskreen.com/ -# npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" -# npm config set always-auth true -# yarn install --frozen-lockfile -# yarn install-client:frozenlockfile + - name: Configure private AWS npm registry and install packages from it + # if: ${{ failure() }} + run: | + npm config set registry https://packages.deskreen.com/ + npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" + npm config set always-auth true + yarn install --frozen-lockfile + cd app/client + yarn install --frozen-lockfile -# # following step does code signing when `electron-builder --publish always` (look in package.json) -# - name: yarn package-ci -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn package-ci + # following step does code signing when `electron-builder --publish always` (look in package.json) + - name: yarn package-ci + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn package-ci -# - name: yarn build -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn build + - name: yarn build + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn build -# - name: yarn lint -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn lint + - name: yarn lint + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn lint -# - name: yarn tsc -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn tsc + - name: yarn tsc + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn tsc -# - name: yarn test -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn test + - name: yarn test + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn test -# - name: yarn build-ux -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: yarn build-ux + - name: yarn build-ux + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: yarn build-ux -# - name: yarn test-ux -# uses: GabrielBB/xvfb-action@v1.2 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# run: yarn test-ux + - name: yarn test-ux + uses: GabrielBB/xvfb-action@v1.2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + run: yarn test-ux diff --git a/README.md b/README.md index 5ce223d..932ce4c 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ sonar.login=d0c254aaff5ebd89dd5c6f0663238ab6ad5fddea ## Maintainer -- [Pavlo (Paul) Buidenkov](https://github.com/pavlo/buidenkov) +- [Pavlo (Paul) Buidenkov](https://github.com/pavlobu) ## License -MIT © [Deskreen](https://github.com/pavlobu/deskreen) +MIT © [Pavlo (Paul) Buidenkov](https://github.com/pavlobu/deskreen) ## Copyright diff --git a/app/components/StepsOfStepper/IntermediateStep.tsx b/app/components/StepsOfStepper/IntermediateStep.tsx index 73245dc..c8878c4 100644 --- a/app/components/StepsOfStepper/IntermediateStep.tsx +++ b/app/components/StepsOfStepper/IntermediateStep.tsx @@ -98,14 +98,20 @@ export default function IntermediateStep(props: IntermediateStepProps) { // ) : ( // <> // ) - // eslint-disable-next-line react/jsx-indent - + props.activeStep === 0 ? ( + // eslint-disable-next-line react/jsx-indent + + ) : ( + <> + ) } { /**/