ARCH-130: cleanup

checkout-charlie · Oct 17, 2023 · d389acb · d389acb
1 parent c4959b2
commit d389acb
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/scripts/buildx.sh → _scripts/buildx.sh b/scripts/buildx.sh → _scripts/buildx.sh
diff --git a/scripts/docker-run-cypress.sh → _scripts/docker-run-cypress.sh b/scripts/docker-run-cypress.sh → _scripts/docker-run-cypress.sh
diff --git a/scripts/docker-run-e2e.sh → _scripts/docker-run-e2e.sh b/scripts/docker-run-e2e.sh → _scripts/docker-run-e2e.sh
diff --git a/scripts/docker-run.sh → _scripts/docker-run.sh b/scripts/docker-run.sh → _scripts/docker-run.sh
diff --git a/scripts/humanitec.js → _scripts/humanitec.js b/scripts/humanitec.js → _scripts/humanitec.js
diff --git a/scripts/push-to-humanitec.sh → _scripts/push-to-humanitec.sh b/scripts/push-to-humanitec.sh → _scripts/push-to-humanitec.sh
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'