diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 142cb557bb..174b9ffa64 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -19,15 +19,13 @@ on: required: false default: true type: boolean - additional_run_commands: - required: false - type: string build_args: required: false type: string env: IMG: ${{ inputs.docker_image_name }} + BUILD_VER: 1.0.${{ github.run_number }} DOCKERFILE_PATH: Docker/${{ inputs.dockerfile_name }} jobs: @@ -37,12 +35,9 @@ jobs: - name: Configure Environment Variables run: | OWNER="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" - echo "BUILD_VER=1.0.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV - echo "IMG=${IMG}" >> $GITHUB_ENV echo "IMAGE=ghcr.io/${OWNER}/${IMG}" >> $GITHUB_ENV echo "BUILD_DATE=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_ENV echo "GIT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV - ${{ inputs.additional_run_commands }} - name: Get branch name (merge) if: github.event_name == 'push' shell: bash @@ -74,7 +69,7 @@ jobs: shell: bash run: | TAGS="" - if [[ -n "${{ inputs.docker_image_tag }}" ]]; then + if [[ -n "${{ inputs.docker_tag }}" ]]; then CURRENT_DATE=$(date +'%d-%m-%Y_%H%M') TAGS="${{ env.IMAGE }}:${CURRENT_DATE},${{ env.IMAGE }}:${{ env.GIT_SHA }},${{ env.IMAGE }}:${{ env.BUILD_VER }}" else @@ -89,12 +84,12 @@ jobs: echo "DOCKER_TAGS=$TAGS" >> $GITHUB_ENV - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: version: latest install: true - name: Cache Docker layers - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -109,7 +104,6 @@ jobs: - uses: docker/build-push-action@v4 with: context: . - registry: ghcr.io file: ${{ env.DOCKERFILE_PATH }} builder: ${{ steps.buildx.outputs.name }} build-args: | @@ -117,8 +111,8 @@ jobs: labels: | org.opencontainers.image.authors=${{ github.repository_owner }} org.opencontainers.image.created=${{ env.BUILD_DATE }} - org.opencontainers.image.description=Created from commit ${{ env.GIT_SHA }} and ref ${{ env.GIT_REF }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.description=Created from commit ${{ env.GIT_SHA }} and ref ${{ github.ref_name }} + org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.source=https://github.com/${{ github.repository }} org.opencontainers.image.version=${{ env.BUILD_VER }} diff --git a/.github/workflows/fe-dev-deploy.yml b/.github/workflows/fe-dev-deploy.yml index b676a277a8..106e5c0531 100644 --- a/.github/workflows/fe-dev-deploy.yml +++ b/.github/workflows/fe-dev-deploy.yml @@ -30,8 +30,6 @@ jobs: docker_tag: dev-latest branch_name: ${{ inputs.branch_name || 'v2-development' }} build_args: YARN_BUILD_COMMAND=${{ inputs.build_variant }} - additional_run_commands: | - export NODE_OPTIONS=--max-old-space-size=8192 secrets: inherit deploy: needs: [build-and-push] diff --git a/.github/workflows/fe-prod-deploy.yml b/.github/workflows/fe-prod-deploy.yml index e04b14d13c..801c7021bf 100644 --- a/.github/workflows/fe-prod-deploy.yml +++ b/.github/workflows/fe-prod-deploy.yml @@ -52,9 +52,6 @@ jobs: docker_tag: ${{ inputs.docker_image_tag }} branch_name: ${{ inputs.branch_name || 'v2' }} build_args: YARN_BUILD_COMMAND=${{ inputs.build_variant }} - additional_run_commands: | - echo "NODE_OPTIONS=--max_old_space_size=8192" >> $GITHUB_ENV - export NODE_OPTIONS=--max-old-space-size=8192 secrets: inherit deploy: needs: [build-and-push] diff --git a/.github/workflows/on_pr_build_all.yml b/.github/workflows/on_pr_build_all.yml index 910aa34e67..dc8e80e570 100644 --- a/.github/workflows/on_pr_build_all.yml +++ b/.github/workflows/on_pr_build_all.yml @@ -33,9 +33,6 @@ jobs: dockerfile_name: Dockerfile.fe push_to_registry: ${{ needs.check-branch.outputs.push_to_registry == 'true' }} build_args: YARN_BUILD_COMMAND=build - additional_run_commands: | - echo "NODE_OPTIONS=--max_old_space_size=8192" >> $GITHUB_ENV - export NODE_OPTIONS=--max-old-space-size=8192 secrets: inherit build-ui: name: UI api build diff --git a/.github/workflows/ui-prod-deploy.yml b/.github/workflows/ui-prod-deploy.yml index bf4fe07778..a53051a56c 100644 --- a/.github/workflows/ui-prod-deploy.yml +++ b/.github/workflows/ui-prod-deploy.yml @@ -39,9 +39,6 @@ jobs: dockerfile_name: Dockerfile.ui docker_tag: ${{ inputs.docker_image_tag }} branch_name: ${{ inputs.branch_name || 'v2' }} - additional_run_commands: | - echo "NODE_OPTIONS=--max_old_space_size=8192" >> $GITHUB_ENV - export NODE_OPTIONS=--max-old-space-size=8192 secrets: inherit deploy: needs: [build-and-push] diff --git a/.github/workflows/update-linked-issues-status.yml b/.github/workflows/update-linked-issues-status.yml index f84868d3ec..1414aec589 100644 --- a/.github/workflows/update-linked-issues-status.yml +++ b/.github/workflows/update-linked-issues-status.yml @@ -14,11 +14,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Cache npm dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/projects-workflow-scripts/package-lock.json') }}