From f5d10683a1edeba4dabe148ff7aa682c044f7496 Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 26 Jul 2020 15:02:55 +0800 Subject: Merge front end repo --- .github/workflows/back-ci.yaml | 45 +++++++++++++++++++++++++++++++++++++++ .github/workflows/cd-version.yaml | 2 -- .github/workflows/cd.yaml | 2 -- .github/workflows/ci.yaml | 41 ----------------------------------- .github/workflows/front-ci.yaml | 43 +++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 45 deletions(-) create mode 100644 .github/workflows/back-ci.yaml delete mode 100644 .github/workflows/ci.yaml create mode 100644 .github/workflows/front-ci.yaml (limited to '.github/workflows') diff --git a/.github/workflows/back-ci.yaml b/.github/workflows/back-ci.yaml new file mode 100644 index 00000000..c4e45872 --- /dev/null +++ b/.github/workflows/back-ci.yaml @@ -0,0 +1,45 @@ +name: Back End CI + +on: + push: + branches: [master] + paths-ignore: + - "Timeline/ClientApp/**" + pull_request: + branches: [master] + paths-ignore: + - "Timeline/ClientApp/**" + +jobs: + build: + name: Build And Test + runs-on: ubuntu-latest + env: + ASPNETCORE_ENVIRONMENT: "Development" + NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages + + steps: + - uses: actions/checkout@v2 + + - name: Restore Cache + uses: actions/cache@v2 + with: + path: ${{ env.NUGET_PACKAGES }} + key: nuget-${{ runner.os }}-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + nuget-${{ runner.os }}- + + - name: Use .Net Core 3.1.x + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "3.1.x" + + - name: Build And Test + run: dotnet test --logger html --collect:"XPlat Code Coverage" --settings './Timeline.Tests/coverletArgs.runsettings' + + - name: Upload Test Artifact + uses: actions/upload-artifact@v2 + if: ${{ success() || failure() }} + with: + name: test-result + path: Timeline.Tests/TestResults/ diff --git a/.github/workflows/cd-version.yaml b/.github/workflows/cd-version.yaml index 72531eef..a15acd2a 100644 --- a/.github/workflows/cd-version.yaml +++ b/.github/workflows/cd-version.yaml @@ -12,8 +12,6 @@ jobs: steps: - uses: actions/checkout@v2 - with: - submodules: true - name: Build And Push to Docker Hub uses: docker/build-push-action@v1 diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 4ae002c4..4ddfd6d1 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -11,8 +11,6 @@ jobs: steps: - uses: actions/checkout@v2 - with: - submodules: true - name: Build And Push to Docker Hub uses: docker/build-push-action@v1 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index b59f94fb..00000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: CI - -on: - push: - branches: [master] - pull_request: - branches: [master] - -jobs: - build: - name: Build And Test - runs-on: ubuntu-latest - env: - ASPNETCORE_ENVIRONMENT: "Development" - NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages - - steps: - - uses: actions/checkout@v2 - - - name: Restore Cache - uses: actions/cache@v2 - with: - path: ${{ env.NUGET_PACKAGES }} - key: nuget-${{ runner.os }}-${{ hashFiles('**/packages.lock.json') }} - restore-keys: | - nuget-${{ runner.os }}- - - - name: Use .Net Core 3.1.x - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "3.1.x" - - - name: Build And Test - run: dotnet test --logger html --collect:"XPlat Code Coverage" --settings './Timeline.Tests/coverletArgs.runsettings' - - - name: Upload Test Artifact - uses: actions/upload-artifact@v2 - if: ${{ success() || failure() }} - with: - name: test-result - path: Timeline.Tests/TestResults/ diff --git a/.github/workflows/front-ci.yaml b/.github/workflows/front-ci.yaml new file mode 100644 index 00000000..b549479a --- /dev/null +++ b/.github/workflows/front-ci.yaml @@ -0,0 +1,43 @@ +name: Front End CI + +on: + push: + branches: [master] + paths: + - "Timeline/ClientApp/**" + pull_request: + branches: [master] + paths: + - "Timeline/ClientApp/**" + +jobs: + build: + name: Build + runs-on: ubuntu-latest + defaults: + run: + shell: bash + working-directory: Timeline/ClientApp + + steps: + - uses: actions/checkout@v2 + + - name: Use Node.js 14 + uses: actions/setup-node@v1 + with: + node-version: "14" + + - name: Restore Packages + run: yarn + + - name: Build App + run: yarn build + + - name: Lint Code + run: yarn lint + + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: dist + path: Timeline/ClientApp/dist/ -- cgit v1.2.3