diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 35ce403334..a9dbf3ab17 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -21,7 +21,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd Accounts && npm install && npm run compile && npm run dep-check compile-isolated-vm: @@ -49,18 +49,6 @@ jobs: - run: cd Common && npm install - run: cd CommonServer && npm install && npm run compile && npm run dep-check - compile-common-ui: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 18.3.0 - - run: cd Common && npm install - - run: cd CommonUI && npm install --force && npm run compile && npm run dep-check - compile-common: runs-on: ubuntu-latest env: @@ -83,7 +71,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd App && npm install && npm run compile && npm run dep-check compile-copilot: @@ -110,7 +98,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd Nginx && npm install && npm run compile && npm run dep-check compile-infrastructure-agent: @@ -135,7 +123,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check compile-dashboard: @@ -149,7 +137,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd Dashboard && npm install && npm run compile && npm run dep-check @@ -203,7 +191,7 @@ jobs: node-version: 18.3.0 - run: cd Common && npm install - run: cd CommonServer && npm install - - run: cd CommonUI && npm install --force + - run: cd StatusPage && npm install && npm run compile && npm run dep-check compile-test-server: diff --git a/.github/workflows/test.commonui.yaml b/.github/workflows/test.commonui.yaml deleted file mode 100644 index 0bb57f4803..0000000000 --- a/.github/workflows/test.commonui.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: CommonUI Test - -on: - pull_request: - push: - branches-ignore: - - 'hotfix-*' # excludes hotfix branches - - 'release' - -jobs: - test: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 18.3.0 - - run: cd Common && npm install - - run: cd CommonUI && npm install --force && npm run test - \ No newline at end of file diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl index ed7fe54e45..f4c5babb89 100644 --- a/Accounts/Dockerfile.tpl +++ b/Accounts/Dockerfile.tpl @@ -51,14 +51,7 @@ COPY ./CommonServer /usr/src/CommonServer -# Install CommonUI -WORKDIR /usr/src/CommonUI -COPY ./CommonUI/package*.json /usr/src/CommonUI/ -# Set version in ./CommonUI/package.json to the APP_VERSION -RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json -RUN npm install --force -COPY ./CommonUI /usr/src/CommonUI diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl index 08ef9baec9..8193c71e15 100644 --- a/AdminDashboard/Dockerfile.tpl +++ b/AdminDashboard/Dockerfile.tpl @@ -50,14 +50,7 @@ COPY ./CommonServer /usr/src/CommonServer -# Install CommonUI -WORKDIR /usr/src/CommonUI -COPY ./CommonUI/package*.json /usr/src/CommonUI/ -# Set version in ./CommonUI/package.json to the APP_VERSION -RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json -RUN npm install --force -COPY ./CommonUI /usr/src/CommonUI diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl index b6fdb6a8d2..7c62b684de 100644 --- a/Dashboard/Dockerfile.tpl +++ b/Dashboard/Dockerfile.tpl @@ -48,18 +48,6 @@ RUN npm install COPY ./CommonServer /usr/src/CommonServer - - -# Install CommonUI - -WORKDIR /usr/src/CommonUI -COPY ./CommonUI/package*.json /usr/src/CommonUI/ -# Set version in ./CommonUI/package.json to the APP_VERSION -RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json -RUN npm install --force -COPY ./CommonUI /usr/src/CommonUI - - ENV PRODUCTION=true ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl index 48c9fcf13d..7f5b17791e 100644 --- a/StatusPage/Dockerfile.tpl +++ b/StatusPage/Dockerfile.tpl @@ -49,14 +49,7 @@ RUN npm install COPY ./CommonServer /usr/src/CommonServer -# Install CommonUI -WORKDIR /usr/src/CommonUI -COPY ./CommonUI/package*.json /usr/src/CommonUI/ -# Set version in ./CommonUI/package.json to the APP_VERSION -RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json -RUN npm install --force -COPY ./CommonUI /usr/src/CommonUI