From 7f8da2d3795daab9212688cfc5f30fd097fa8954 Mon Sep 17 00:00:00 2001 From: olha-dev-fullstack Date: Thu, 27 Feb 2025 18:36:18 +0200 Subject: [PATCH 1/4] fix port --- .github/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index b856d41..06ff20f 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -42,7 +42,7 @@ jobs: echo "DB_DROP_SCHEMA=${{ secrets.DB_DROP_SCHEMA }}" >> ${{inputs.env_file}} echo "AUTH_SECRET=${{ secrets.AUTH_SECRET }}" >> ${{inputs.env_file}} echo "JWT_EXPIRES_IN=${{ secrets.JWT_EXPIRES_IN }}" >> ${{inputs.env_file}} - echo "PORT=${{ secrets.PORT }}" >> ${{inputs.env_file}} + echo "PORT=${{ vars.PORT }}" >> ${{inputs.env_file}} test: runs-on: [self-hosted, "${{inputs.runner}}"] needs: create_env From 020b3ea46af40d99975f8e8b58a69d75493e2513 Mon Sep 17 00:00:00 2001 From: olha-dev-fullstack Date: Thu, 27 Feb 2025 18:52:26 +0200 Subject: [PATCH 2/4] fix port --- .github/workflows/deployment.yml | 5 ++++- .github/workflows/dev.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 06ff20f..f61c1e0 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -11,6 +11,9 @@ on: env_file: type: string required: true + port: + type: string + required: true jobs: checkout: runs-on: [self-hosted, "${{inputs.runner}}"] @@ -42,7 +45,7 @@ jobs: echo "DB_DROP_SCHEMA=${{ secrets.DB_DROP_SCHEMA }}" >> ${{inputs.env_file}} echo "AUTH_SECRET=${{ secrets.AUTH_SECRET }}" >> ${{inputs.env_file}} echo "JWT_EXPIRES_IN=${{ secrets.JWT_EXPIRES_IN }}" >> ${{inputs.env_file}} - echo "PORT=${{ vars.PORT }}" >> ${{inputs.env_file}} + echo "PORT=${{ inputs.port }}" >> ${{inputs.env_file}} test: runs-on: [self-hosted, "${{inputs.runner}}"] needs: create_env diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 16ca3b3..1cfa1b3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -11,4 +11,5 @@ jobs: environment: "dev" runner: "dev" env_file: "dev.env" + port: ${{vars.PORT}} secrets: inherit \ No newline at end of file From fd6770d7e5ee0cfa51ba6304ac04430250bcdb6d Mon Sep 17 00:00:00 2001 From: olha-dev-fullstack Date: Thu, 27 Feb 2025 19:03:34 +0200 Subject: [PATCH 3/4] fix port --- .github/workflows/deployment.yml | 8 +++++++- .github/workflows/dev.yml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index f61c1e0..d3d32df 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -30,8 +30,14 @@ jobs: - name: Install dependencies if: steps.cache.outputs.cache-hit != 'true' run: npm ci + check_port: + needs: checkout + runs-on: [self-hosted, "${{inputs.runner}}"] + steps: + - run: | + echo "port: ${{inputs.port}}" create_env: - needs: checkout + needs: check_port runs-on: [self-hosted, "${{inputs.runner}}"] environment: ${{inputs.environment}} steps: diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1cfa1b3..bc22651 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -11,5 +11,5 @@ jobs: environment: "dev" runner: "dev" env_file: "dev.env" - port: ${{vars.PORT}} + port: "${{vars.PORT}}" secrets: inherit \ No newline at end of file From 1266dc72db14916f594c7adc24b434be34a497a4 Mon Sep 17 00:00:00 2001 From: olha-dev-fullstack Date: Thu, 27 Feb 2025 22:21:14 +0200 Subject: [PATCH 4/4] try vars again --- .github/workflows/deployment.yml | 10 +++++----- .github/workflows/dev.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index d3d32df..e86db61 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -11,9 +11,9 @@ on: env_file: type: string required: true - port: - type: string - required: true + # port: + # type: string + # required: true jobs: checkout: runs-on: [self-hosted, "${{inputs.runner}}"] @@ -35,7 +35,7 @@ jobs: runs-on: [self-hosted, "${{inputs.runner}}"] steps: - run: | - echo "port: ${{inputs.port}}" + echo "port: ${{vars.PORT}}" create_env: needs: check_port runs-on: [self-hosted, "${{inputs.runner}}"] @@ -51,7 +51,7 @@ jobs: echo "DB_DROP_SCHEMA=${{ secrets.DB_DROP_SCHEMA }}" >> ${{inputs.env_file}} echo "AUTH_SECRET=${{ secrets.AUTH_SECRET }}" >> ${{inputs.env_file}} echo "JWT_EXPIRES_IN=${{ secrets.JWT_EXPIRES_IN }}" >> ${{inputs.env_file}} - echo "PORT=${{ inputs.port }}" >> ${{inputs.env_file}} + echo "PORT=${{ vars.PORT }}" >> ${{inputs.env_file}} test: runs-on: [self-hosted, "${{inputs.runner}}"] needs: create_env diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index bc22651..2e4dcb0 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -11,5 +11,5 @@ jobs: environment: "dev" runner: "dev" env_file: "dev.env" - port: "${{vars.PORT}}" + # port: "${{ vars.PORT }}" secrets: inherit \ No newline at end of file