From 67dbd99cc7ebc05d59dde9bc78941e65a597b312 Mon Sep 17 00:00:00 2001 From: Jason Godson Date: Wed, 8 May 2024 14:29:48 -0600 Subject: [PATCH] remove token check step --- action.yml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/action.yml b/action.yml index 0820ff8..95d0e21 100644 --- a/action.yml +++ b/action.yml @@ -43,29 +43,6 @@ outputs: runs: using: 'composite' steps: - - name: Check Oxygen version - shell: 'bash' - id: check_version - run: | - TOKEN="${{ inputs.oxygen_deployment_token }}" - echo "::add-mask::$TOKEN" - - if [[ "${TOKEN}" == *":"* ]]; then - echo "Multi token" - IFS=':' read -ra token_list <<< "${TOKEN}" - token=${token_list[1]} - echo "::add-mask::$token" - echo "token=$token" >> $GITHUB_OUTPUT - else - if [[ "${TOKEN}" =~ ^[A-Za-z0-9+/]+[=]{0,2}$ ]]; then - echo "Token is in V2 format" - echo "token=${TOKEN}" >> $GITHUB_OUTPUT - else - echo "Your repository is out of date, please disconnect and reconnect your storefront on Shopify" - exit 1 - fi - fi - - name: Build and Publish to Oxygen shell: 'bash' id: 'oxygen-cli-action' @@ -73,13 +50,16 @@ runs: NODE_ENV: production run: | echo "Deploying to Oxygen..." + TOKEN="${{ inputs.oxygen_deployment_token }}" + echo "::add-mask::$TOKEN" + build_command_filtered=$(echo '${{ inputs.build_command }}' | sed 's/HYDROGEN_ASSET_BASE_URL=$OXYGEN_ASSET_BASE_URL //g') oxygen_command="npm exec --package=@shopify/oxygen-cli@3.1.1 -- oxygen-cli oxygen:deploy \ --path=${{ inputs.path }} \ --assetsFolder=${{ inputs.oxygen_client_dir }} \ --workerFolder=${{ inputs.oxygen_worker_dir }} \ --verificationMaxDuration=${{ inputs.oxygen_deployment_verification_max_duration }} \ - --token=${{ steps.check_version.outputs.token }}" + --token=${{ TOKEN }}" if [ "${{ inputs.oxygen_deployment_verification }}" == "false" ]; then oxygen_command+=" --skipVerification" fi