diff --git a/.github/workflows/dev_module_build.yml b/.github/workflows/dev_module_build.yml index 373bafcb8c..e396195f0c 100644 --- a/.github/workflows/dev_module_build.yml +++ b/.github/workflows/dev_module_build.yml @@ -360,7 +360,7 @@ jobs: with: module_source: ${{ vars.DEV_MODULE_SOURCE}} module_name: ${{ vars.MODULE_NAME }} - module_tag: "$MODULES_MODULE_TAG" + module_tag: ${{needs.set_vars.outputs.modules_module_tag}} pull_request_info: name: Get PR info diff --git a/.github/workflows/release_module_build-and-registration.yml b/.github/workflows/release_module_build-and-registration.yml index 8b5a4c4665..1e26c27fde 100644 --- a/.github/workflows/release_module_build-and-registration.yml +++ b/.github/workflows/release_module_build-and-registration.yml @@ -44,9 +44,12 @@ jobs: name: Build and Push CE steps: - name: SET VAR + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_OUTPUT" echo "MODULE_EDITION=CE" >> "$GITHUB_ENV" + echo "MODULE_EDITION=CE" >> "$GITHUB_OUTPUT" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -74,9 +77,9 @@ jobs: - uses: deckhouse/modules-actions/build@v2 with: - module_source: "$MODULES_MODULE_SOURCE" + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} - module_tag: "$MODULES_MODULE_TAG" + module_tag: ${{ github.ref_name }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_ee_setup_build: @@ -84,9 +87,12 @@ jobs: name: Build and Push EE steps: - name: SET VAR + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_OUTPUT" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" + echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -114,9 +120,9 @@ jobs: - uses: deckhouse/modules-actions/build@v2 with: - module_source: "$MODULES_MODULE_SOURCE" + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} - module_tag: "$MODULES_MODULE_TAG" + module_tag: ${{ github.ref_name }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_se_plus_setup_build: @@ -125,9 +131,12 @@ jobs: name: Build and Push SE Plus steps: - name: SET VAR + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_OUTPUT" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" + echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -155,9 +164,9 @@ jobs: - uses: deckhouse/modules-actions/build@v2 with: - module_source: "$MODULES_MODULE_SOURCE" + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} - module_tag: "$MODULES_MODULE_TAG" + module_tag: ${{ github.ref_name }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_fe_setup_build: @@ -166,9 +175,12 @@ jobs: name: Build and Push FE steps: - name: SET VAR + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_OUTPUT" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" + echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -196,7 +208,7 @@ jobs: - uses: deckhouse/modules-actions/build@v2 with: - module_source: "$MODULES_MODULE_SOURCE" + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} - module_tag: "$MODULES_MODULE_TAG" + module_tag: ${{ github.ref_name }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" diff --git a/.github/workflows/release_module_release-channels.yml b/.github/workflows/release_module_release-channels.yml index e3f210b37f..fcaac8a11e 100644 --- a/.github/workflows/release_module_release-channels.yml +++ b/.github/workflows/release_module_release-channels.yml @@ -79,7 +79,7 @@ jobs: steps: - run: echo "CE" - name: SET VAR - id: set_var + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV" echo "MODULE_EDITION=CE" >> "$GITHUB_ENV" @@ -108,14 +108,14 @@ jobs: - if: ${{ github.event.inputs.enableBuild == 'true' }} uses: deckhouse/modules-actions/build@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" - uses: deckhouse/modules-actions/deploy@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} release_channel: ${{ github.event.inputs.version }} @@ -127,7 +127,7 @@ jobs: steps: - run: echo "EE" - name: SET VAR - id: set_var + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" @@ -162,14 +162,14 @@ jobs: - if: ${{ github.event.inputs.enableBuild == 'true' }} uses: deckhouse/modules-actions/build@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" - uses: deckhouse/modules-actions/deploy@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} release_channel: ${{ github.event.inputs.version }} @@ -181,7 +181,7 @@ jobs: steps: - run: echo "SE Plus" - name: SET VAR - id: set_var + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" @@ -210,14 +210,14 @@ jobs: - if: ${{ github.event.inputs.enableBuild == 'true' }} uses: deckhouse/modules-actions/build@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" - uses: deckhouse/modules-actions/deploy@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} release_channel: ${{ github.event.inputs.version }} @@ -229,7 +229,7 @@ jobs: steps: - run: echo "FE" - name: SET VAR - id: set_var + id: set_vars run: | echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV" echo "MODULE_EDITION=EE" >> "$GITHUB_ENV" @@ -262,14 +262,14 @@ jobs: - if: ${{ github.event.inputs.enableBuild == 'true' }} uses: deckhouse/modules-actions/build@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" - uses: deckhouse/modules-actions/deploy@v2 with: - module_source: ${{ steps.set_var.outputs.MODULES_MODULE_SOURCE }} + module_source: ${{ steps.set_vars.outputs.MODULES_MODULE_SOURCE }} module_name: ${{ vars.MODULE_NAME }} module_tag: ${{ github.event.inputs.tag }} release_channel: ${{ github.event.inputs.version }}