From c462518c074bd2c09416e75ab45d8acfdd3a300b Mon Sep 17 00:00:00 2001 From: abhijeetw035 Date: Thu, 10 Apr 2025 00:42:34 +0530 Subject: [PATCH] (fix) : Updated action's versions and .gitiginore --- .github/workflows/build-on-pull-request.yml | 15 +++--- .github/workflows/package-prod.yml | 51 --------------------- .github/workflows/package.yml | 16 +++---- .gitignore | 3 +- 4 files changed, 17 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/package-prod.yml diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 2a429ee3..737b0929 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -8,26 +8,27 @@ jobs: Build: runs-on: ubuntu-latest steps: - - name: Checkout code with submodules - uses: actions/checkout@v3 + - name: Checkout code with submodule + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - submodules: true + submodules: true + fetch-depth: 0 - - name: Update submodules manually (if needed) + - name: Update submodules run: | git submodule init git submodule update --recursive - name: Setup JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'adopt' - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 18 @@ -36,7 +37,5 @@ jobs: npm config set legacy-peer-deps true npm install -g @angular/cli npm install typescript@5.1.3 --save-dev - npm install ng2-smart-table@1.2.1 - npm install node-sass npm install --force npm run build-ci \ No newline at end of file diff --git a/.github/workflows/package-prod.yml b/.github/workflows/package-prod.yml deleted file mode 100644 index 0d3e5e28..00000000 --- a/.github/workflows/package-prod.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Package Prod -on: - push: - branches: [ "master"] - -jobs: - Package: - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - steps: - - - name: Checkout code - uses: actions/checkout@v3 - - - - name: Set up Java - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'adopt' - - - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: 18 - - - - name: Build with NPM and Create WAR file - run: | - npm config set legacy-peer-deps true - npm install -g @angular/cli - npm install -g grunt-cli - npm install typescript@5.1.3 --save-dev - npm install ng2-smart-table@1.2.1 - npm install node-sass --force - npm install --force - ng build --configuration production - - - - name: Upload WAR file as artifact - uses: actions/upload-artifact@v2 - with: - name: ADMIN-UI - path: dist/admin-ui/admin-ui.war diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6db2ad0f..62bdf630 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -16,17 +16,19 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 - + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'adopt' - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 18 @@ -35,16 +37,14 @@ jobs: npm config set legacy-peer-deps true npm install -g @angular/cli npm install typescript@5.1.3 --save-dev - npm install ng2-smart-table@1.2.1 - npm install node-sass npm install --force - npm run build + npm run build-ci - name: Create WAR file run: jar -cvf admin-ui.war -C dist . - name: Upload WAR file as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ADMIN-UI path: admin-ui.war diff --git a/.gitignore b/.gitignore index 01ef257b..263fd53e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ testem.log .DS_Store Thumbs.db -src/environments/environment.ts \ No newline at end of file +src/environments/environment.ts +src/environments/environment.ci.ts \ No newline at end of file