From d389acb79d1df003eb3819b806c7f433337203d7 Mon Sep 17 00:00:00 2001 From: Federico Infanti Date: Tue, 17 Oct 2023 17:20:30 +0200 Subject: [PATCH] ARCH-130: cleanup --- {scripts => _scripts}/buildx.sh | 0 {scripts => _scripts}/docker-run-cypress.sh | 0 {scripts => _scripts}/docker-run-e2e.sh | 0 {scripts => _scripts}/docker-run.sh | 0 {scripts => _scripts}/humanitec.js | 0 {scripts => _scripts}/push-to-humanitec.sh | 0 build/action.yaml | 2 +- humanitec-deploy-pr/action.yaml | 2 +- humanitec-push-image/action.yaml | 2 +- humanitec-set-image-automation/action.yaml | 2 +- humanitec-undeploy-pr/action.yaml | 2 +- run-command/action.yaml | 2 +- run-tests/action.yaml | 4 ++-- 13 files changed, 8 insertions(+), 8 deletions(-) rename {scripts => _scripts}/buildx.sh (100%) rename {scripts => _scripts}/docker-run-cypress.sh (100%) rename {scripts => _scripts}/docker-run-e2e.sh (100%) rename {scripts => _scripts}/docker-run.sh (100%) rename {scripts => _scripts}/humanitec.js (100%) rename {scripts => _scripts}/push-to-humanitec.sh (100%) diff --git a/scripts/buildx.sh b/_scripts/buildx.sh similarity index 100% rename from scripts/buildx.sh rename to _scripts/buildx.sh diff --git a/scripts/docker-run-cypress.sh b/_scripts/docker-run-cypress.sh similarity index 100% rename from scripts/docker-run-cypress.sh rename to _scripts/docker-run-cypress.sh diff --git a/scripts/docker-run-e2e.sh b/_scripts/docker-run-e2e.sh similarity index 100% rename from scripts/docker-run-e2e.sh rename to _scripts/docker-run-e2e.sh diff --git a/scripts/docker-run.sh b/_scripts/docker-run.sh similarity index 100% rename from scripts/docker-run.sh rename to _scripts/docker-run.sh diff --git a/scripts/humanitec.js b/_scripts/humanitec.js similarity index 100% rename from scripts/humanitec.js rename to _scripts/humanitec.js diff --git a/scripts/push-to-humanitec.sh b/_scripts/push-to-humanitec.sh similarity index 100% rename from scripts/push-to-humanitec.sh rename to _scripts/push-to-humanitec.sh diff --git a/build/action.yaml b/build/action.yaml index 2f726ad..2c80160 100644 --- a/build/action.yaml +++ b/build/action.yaml @@ -34,7 +34,7 @@ runs: restore-keys: | ${{ inputs.image_name }}-build-cache- - name: Building ${{ inputs.image_name }} ${{ inputs.stages }} - run: ${{ github.action_path }}/../scripts/buildx.sh "${{ inputs.build_context }}" "${{ inputs.dockerfile }}" "${{ inputs.build_args }}" "${{ inputs.image_name }}" "${{ inputs.stages }}" + run: ${{ github.action_path }}/../_scripts/buildx.sh "${{ inputs.build_context }}" "${{ inputs.dockerfile }}" "${{ inputs.build_args }}" "${{ inputs.image_name }}" "${{ inputs.stages }}" shell: sh - name: Delete previous cache shell: sh diff --git a/humanitec-deploy-pr/action.yaml b/humanitec-deploy-pr/action.yaml index 2ca1686..b0eec5c 100644 --- a/humanitec-deploy-pr/action.yaml +++ b/humanitec-deploy-pr/action.yaml @@ -45,7 +45,7 @@ runs: HUMANITEC_TOKEN: ${{ inputs.humanitec_token }} with: script: | - const humanitec = require('${{ github.action_path }}/../scripts/humanitec.js'); + const humanitec = require('${{ github.action_path }}/../_scripts/humanitec.js'); const BASE_ENV_ID = `${{ inputs.source_environment }}`; const HUMANITEC_ORG = `${{ inputs.humanitec_org }}`; const ENV_ID = `${{ inputs.environment_name }}`; diff --git a/humanitec-push-image/action.yaml b/humanitec-push-image/action.yaml index 174036f..98aab8b 100644 --- a/humanitec-push-image/action.yaml +++ b/humanitec-push-image/action.yaml @@ -21,5 +21,5 @@ runs: using: "composite" steps: - name: Push to Humanitec - run: ${{ github.action_path }}/../scripts/push-to-humanitec.sh ${{ inputs.humanitec_org }} ${{ inputs.humanitec_token }} ${{ inputs.image_name }} ${{ inputs.image_stage }} + run: ${{ github.action_path }}/../_scripts/push-to-humanitec.sh ${{ inputs.humanitec_org }} ${{ inputs.humanitec_token }} ${{ inputs.image_name }} ${{ inputs.image_stage }} shell: sh diff --git a/humanitec-set-image-automation/action.yaml b/humanitec-set-image-automation/action.yaml index 5d471e7..3727522 100644 --- a/humanitec-set-image-automation/action.yaml +++ b/humanitec-set-image-automation/action.yaml @@ -31,7 +31,7 @@ runs: HUMANITEC_TOKEN: ${{ inputs.humanitec_token }} with: script: | - const humanitec = require('${{ github.action_path }}/../scripts/humanitec.js'); + const humanitec = require('${{ github.action_path }}/../_scripts/humanitec.js'); const HUMANITEC_ORG = `${{ inputs.humanitec_org }}`; const ENV_ID = `${{ inputs.environment_name }}`; const APP_ID = `${{ inputs.app_id }}`; diff --git a/humanitec-undeploy-pr/action.yaml b/humanitec-undeploy-pr/action.yaml index 6b9d65c..6cd0331 100644 --- a/humanitec-undeploy-pr/action.yaml +++ b/humanitec-undeploy-pr/action.yaml @@ -25,7 +25,7 @@ runs: HUMANITEC_TOKEN: ${{ inputs.humanitec_token }} with: script: | - const humanitec = require('${{ github.action_path }}/../scripts/humanitec.js'); + const humanitec = require('${{ github.action_path }}/../_scripts/humanitec.js'); const HUMANITEC_ORG = `${{ inputs.humanitec_org }}`; const APP_ID = `${{ inputs.app_id }}`; const ENV_ID = `${{ inputs.environment_name }}`; diff --git a/run-command/action.yaml b/run-command/action.yaml index 83db6a1..4e9ad97 100644 --- a/run-command/action.yaml +++ b/run-command/action.yaml @@ -29,5 +29,5 @@ runs: using: "composite" steps: - name: Run command ${{ inputs.entrypoint }} ${{ inputs.command }} in container - run: ${{ github.action_path }}/../scripts/docker-run.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.command }}" "${{ inputs.env_file }}" "${{ inputs.run_args }}" "${{ inputs.entrypoint }}" + run: ${{ github.action_path }}/../_scripts/docker-run.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.command }}" "${{ inputs.env_file }}" "${{ inputs.run_args }}" "${{ inputs.entrypoint }}" shell: sh diff --git a/run-tests/action.yaml b/run-tests/action.yaml index 8204b88..da031da 100644 --- a/run-tests/action.yaml +++ b/run-tests/action.yaml @@ -94,7 +94,7 @@ runs: - name: Run E2E tests id: run-e2e if: inputs.e2e != '' && inputs.cypress_node_version == '' - run: ${{ github.action_path }}/../scripts/docker-run-e2e.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.docker_args }}" "${{ inputs.e2e }}" "${{ inputs.env_file }}" "${{ inputs.e2e_port }}" "${{ inputs.e2e_path }}" "${{ inputs.e2e_readiness_timeout }}" "${{ inputs.screenshots_path }}" + run: ${{ github.action_path }}/../_scripts/docker-run-e2e.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.docker_args }}" "${{ inputs.e2e }}" "${{ inputs.env_file }}" "${{ inputs.e2e_port }}" "${{ inputs.e2e_path }}" "${{ inputs.e2e_readiness_timeout }}" "${{ inputs.screenshots_path }}" shell: sh - name: Prepare Cypress test if: inputs.e2e != '' && inputs.cypress_node_version != '' @@ -104,7 +104,7 @@ runs: - name: Run Cypress tests id: run-cypress if: inputs.e2e != '' && inputs.inputs.cypress_node_version != '' - run: ${{ github.action_path }}/../scripts/docker-run-cypress.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.docker_args }}" "${{ inputs.e2e }}" "${{ inputs.env_file }}" "${{ inputs.e2e_port }}" "${{ inputs.e2e_path }}" + run: ${{ github.action_path }}/../_scripts/docker-run-cypress.sh "${{ inputs.image_name }}" "${{ inputs.image_stage }}" "${{ inputs.docker_args }}" "${{ inputs.e2e }}" "${{ inputs.env_file }}" "${{ inputs.e2e_port }}" "${{ inputs.e2e_path }}" shell: sh - name: Upload screenshots if: inputs.e2e != '' && inputs.screenshots_path != '' && failure() && steps.run-e2e.outcome == 'failure'