From c30bcbd5baa8c0e8d384c7c85058df41cd9d6377 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 21:59:23 +0200 Subject: [PATCH 1/6] Introduce checkout_directory --- .github/workflows/publish_node_package.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index f2f623d..521ef3c 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -13,6 +13,11 @@ on: required: false type: boolean default: false + checkout_directory: + description: 'Directory to checkout the repository to' + required: false + type: string + default: '.' disable_ignore_scripts_on_publish: description: 'If false, add --ignore-scripts flag to npm publish command' required: false @@ -52,7 +57,7 @@ on: required: false default: ${{ github.repository }} working_directory: - description: 'Working directory' + description: 'Working directory within $checkout_directory to run commands' required: false type: string default: '.' @@ -89,7 +94,7 @@ jobs: with: repository: ${{ inputs.repository_name }} ref: ${{ inputs.branch_name }} - path: ${{ inputs.working_directory}} + path: ${{ inputs.checkout_directory}} - name: Set release name id: set_release_name @@ -101,13 +106,13 @@ jobs: fi - name: "Set package version" - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm version prerelease --preid `git rev-parse --short HEAD`-`date +%Y%m%d%H%M` --no-git-tag-version - name: Set dependecies versions if: ${{ inputs.package_dependencies != '' }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | echo "## Dependencies used to build package" >> $GITHUB_STEP_SUMMARY for dependency in $(echo "${{ inputs.package_dependencies }}" | tr '\n' ' ') @@ -137,7 +142,7 @@ jobs: - name: Build package if: ${{ inputs.build_package }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm install --@flowforge:registry=${{ inputs.npm_registry_url }} npm run build @@ -156,7 +161,7 @@ jobs: - name: Publish package if: ${{ inputs.publish_package }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm publish ${{ env.NPM_PUBLISH_PARAMETERS }} --tag ${{ env.release_name }} env: From 8a9cae92d6908c5ce7200c16317adb085bf98228 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 22:04:18 +0200 Subject: [PATCH 2/6] Undo previous commit --- .github/workflows/publish_node_package.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index f2f623d..521ef3c 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -13,6 +13,11 @@ on: required: false type: boolean default: false + checkout_directory: + description: 'Directory to checkout the repository to' + required: false + type: string + default: '.' disable_ignore_scripts_on_publish: description: 'If false, add --ignore-scripts flag to npm publish command' required: false @@ -52,7 +57,7 @@ on: required: false default: ${{ github.repository }} working_directory: - description: 'Working directory' + description: 'Working directory within $checkout_directory to run commands' required: false type: string default: '.' @@ -89,7 +94,7 @@ jobs: with: repository: ${{ inputs.repository_name }} ref: ${{ inputs.branch_name }} - path: ${{ inputs.working_directory}} + path: ${{ inputs.checkout_directory}} - name: Set release name id: set_release_name @@ -101,13 +106,13 @@ jobs: fi - name: "Set package version" - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm version prerelease --preid `git rev-parse --short HEAD`-`date +%Y%m%d%H%M` --no-git-tag-version - name: Set dependecies versions if: ${{ inputs.package_dependencies != '' }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | echo "## Dependencies used to build package" >> $GITHUB_STEP_SUMMARY for dependency in $(echo "${{ inputs.package_dependencies }}" | tr '\n' ' ') @@ -137,7 +142,7 @@ jobs: - name: Build package if: ${{ inputs.build_package }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm install --@flowforge:registry=${{ inputs.npm_registry_url }} npm run build @@ -156,7 +161,7 @@ jobs: - name: Publish package if: ${{ inputs.publish_package }} - working-directory: ${{ inputs.working_directory }} + working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} run: | npm publish ${{ env.NPM_PUBLISH_PARAMETERS }} --tag ${{ env.release_name }} env: From 407efd9afe97513eb3868565aa85dca5b22b0eba Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 22:04:42 +0200 Subject: [PATCH 3/6] Do not checkout repo to workdir --- .github/workflows/publish_node_package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index 521ef3c..aae6e81 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -94,7 +94,6 @@ jobs: with: repository: ${{ inputs.repository_name }} ref: ${{ inputs.branch_name }} - path: ${{ inputs.checkout_directory}} - name: Set release name id: set_release_name From 4c76f57f6ed416c21b7b65d8285a56bb78a1b21d Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 22:07:22 +0200 Subject: [PATCH 4/6] Remove checkout_directory input --- .github/workflows/publish_node_package.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index aae6e81..dda0432 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -13,11 +13,6 @@ on: required: false type: boolean default: false - checkout_directory: - description: 'Directory to checkout the repository to' - required: false - type: string - default: '.' disable_ignore_scripts_on_publish: description: 'If false, add --ignore-scripts flag to npm publish command' required: false @@ -105,13 +100,13 @@ jobs: fi - name: "Set package version" - working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} + working-directory: ${{ inputs.working_directory }} run: | npm version prerelease --preid `git rev-parse --short HEAD`-`date +%Y%m%d%H%M` --no-git-tag-version - name: Set dependecies versions if: ${{ inputs.package_dependencies != '' }} - working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} + working-directory: ${{ inputs.working_directory }} run: | echo "## Dependencies used to build package" >> $GITHUB_STEP_SUMMARY for dependency in $(echo "${{ inputs.package_dependencies }}" | tr '\n' ' ') @@ -141,7 +136,7 @@ jobs: - name: Build package if: ${{ inputs.build_package }} - working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} + working-directory: ${{ inputs.working_directory }} run: | npm install --@flowforge:registry=${{ inputs.npm_registry_url }} npm run build @@ -160,7 +155,7 @@ jobs: - name: Publish package if: ${{ inputs.publish_package }} - working-directory: ${{ inputs.checkout_directory }}/${{ inputs.working_directory }} + working-directory: $${{ inputs.working_directory }} run: | npm publish ${{ env.NPM_PUBLISH_PARAMETERS }} --tag ${{ env.release_name }} env: From 9b2d728ae4d859875bb04d59889dfcd0f24d96e7 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 22:10:51 +0200 Subject: [PATCH 5/6] Typo fix --- .github/workflows/publish_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index dda0432..cff6c3b 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -155,7 +155,7 @@ jobs: - name: Publish package if: ${{ inputs.publish_package }} - working-directory: $${{ inputs.working_directory }} + working-directory: ${{ inputs.working_directory }} run: | npm publish ${{ env.NPM_PUBLISH_PARAMETERS }} --tag ${{ env.release_name }} env: From cd8272c2973e16a909d4d152315ea7b1922c4524 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Thu, 3 Oct 2024 22:45:26 +0200 Subject: [PATCH 6/6] Adjust sorkind_directory description --- .github/workflows/publish_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_node_package.yml b/.github/workflows/publish_node_package.yml index cff6c3b..55f7cf3 100644 --- a/.github/workflows/publish_node_package.yml +++ b/.github/workflows/publish_node_package.yml @@ -52,7 +52,7 @@ on: required: false default: ${{ github.repository }} working_directory: - description: 'Working directory within $checkout_directory to run commands' + description: 'Working directory' required: false type: string default: '.'