diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fcd31dc2..994027d0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,30 +9,9 @@ on: workflow_dispatch: jobs: - build-reactapp: - runs-on: ubuntu-latest - defaults: - run: - working-directory: src/AgileConfig.Server.UI/react-ui-antd - strategy: - matrix: - node-version: [16.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - - run: npm install - - run: npm run build - - uses: actions/upload-artifact@v4 - with: - name: agileconfig-ui - path: src/AgileConfig.Server.UI/react-ui-antd/dist/ + # The React admin UI is built inside the Dockerfile (ui-build stage), so there + # is no separate build-reactapp job here. build-dotnet-push-to-hub: - needs: build-reactapp runs-on: ubuntu-latest steps: @@ -48,10 +27,6 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - uses: actions/download-artifact@v4 - with: - name: agileconfig-ui - path: src/AgileConfig.Server.Apisite/wwwroot/ui - name: Push to Docker Hub uses: docker/build-push-action@v1 with: diff --git a/.github/workflows/test-cd.yml b/.github/workflows/test-cd.yml index 3339ca46..db0f5695 100644 --- a/.github/workflows/test-cd.yml +++ b/.github/workflows/test-cd.yml @@ -9,32 +9,9 @@ on: - 'test-*' workflow_dispatch: jobs: - build-reactapp: - runs-on: ubuntu-latest - defaults: - run: - working-directory: src/AgileConfig.Server.UI/react-ui-antd - strategy: - matrix: - node-version: [16.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - - run: npm install - - run: npm run build - - - uses: actions/upload-artifact@v4 - with: - name: agileconfig-ui - path: src/AgileConfig.Server.UI/react-ui-antd/dist/ - + # The React admin UI is built inside the Dockerfile (ui-build stage), so there + # is no separate build-reactapp job here. build-dotnet-push-to-hub: - needs: build-reactapp runs-on: ubuntu-latest steps: @@ -51,12 +28,7 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - - uses: actions/download-artifact@v4 - with: - name: agileconfig-ui - path: src/AgileConfig.Server.Apisite/wwwroot/ui - + - name: Push to Docker Hub uses: docker/build-push-action@v1 with: