From 819c498ceb2fe20b6e467e47758b6ce765c6fa25 Mon Sep 17 00:00:00 2001 From: vgkowski Date: Mon, 6 Jan 2025 21:53:44 +0100 Subject: [PATCH 1/5] update github action --- .projen/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.projen/tasks.json b/.projen/tasks.json index 6b9651c84..13176d0c1 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -123,7 +123,7 @@ "name": "license", "description": "Overwrite LICENSE file with correct copyrightPeriod and cpyrightOwner", "env": { - "PERIOD": "2021-2024", + "PERIOD": "2021-2025", "OWNER": "Amazon.com, Inc. or its affiliates. All Rights Reserved." }, "steps": [ From 2c29c04d542429b8b78a0f84678b09f2b2d1e758 Mon Sep 17 00:00:00 2001 From: vgkowski Date: Tue, 7 Jan 2025 14:19:46 +0100 Subject: [PATCH 2/5] github actions --- LICENSE | 2 +- framework/LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 5046ef26a..20fe0e018 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2021-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/LICENSE b/framework/LICENSE index 5046ef26a..d64569567 100644 --- a/framework/LICENSE +++ b/framework/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From e2efc232e41c0de5a654d6848ee136c3b4d6e942 Mon Sep 17 00:00:00 2001 From: vgkowski Date: Tue, 7 Jan 2025 14:38:53 +0100 Subject: [PATCH 3/5] github actions --- framework/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/LICENSE b/framework/LICENSE index d64569567..20fe0e018 100644 --- a/framework/LICENSE +++ b/framework/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2021-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 78ee449291b104a0f2e510819ebcf4b58952074a Mon Sep 17 00:00:00 2001 From: vgkowski Date: Tue, 7 Jan 2025 16:12:58 +0100 Subject: [PATCH 4/5] update github action --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed623a230..61546a2c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: build-artifact - path: framework/dist + path: framework include-hidden-files: true - name: Backup examples permissions working-directory: examples From c4e88981a90c29adef463d38d19191f05b345344 Mon Sep 17 00:00:00 2001 From: vgkowski Date: Wed, 8 Jan 2025 12:06:17 +0100 Subject: [PATCH 5/5] fix release github action --- .github/workflows/release.yml | 44 +++++++---------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61546a2c0..32b5c8513 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,6 +35,10 @@ jobs: if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} run: cd dist && getfacl -R . > permissions-backup.acl continue-on-error: true + - name: Clean artifact + working-directory: framework + if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} + run: rm -Rf node_modules - name: Upload artifact if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 @@ -69,7 +73,7 @@ jobs: uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: build-artifact - path: framework/dist + path: framework - name: Download examples artifact uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: @@ -83,12 +87,6 @@ jobs: working-directory: examples run: setfacl --restore=permissions-backup.acl continue-on-error: true - - name: Prepare Repository - working-directory: framework - run: mv dist .repo - - name: Collect GitHub Metadata - working-directory: framework - run: mv .repo/dist dist - name: Release working-directory: framework env: @@ -118,25 +116,13 @@ jobs: uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: build-artifact - path: framework/dist + path: framework - name: Restore build artifact permissions working-directory: framework run: cd dist && setfacl --restore=permissions-backup.acl continue-on-error: true - - name: Prepare Repository - working-directory: framework - run: mv dist .repo - - name: Install Dependencies - working-directory: framework - run: cd .repo && yarn install --check-files --frozen-lockfile - - name: Create js artifact - working-directory: framework - run: cd .repo && npx projen package:js - - name: Collect js Artifact - working-directory: framework - run: mv .repo/dist dist - name: Release - working-directory: framework + working-directory: framework/dist env: NPM_DIST_TAG: latest NPM_REGISTRY: registry.npmjs.org @@ -162,24 +148,12 @@ jobs: uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: name: build-artifact - path: framework/dist + path: framework - name: Restore build artifact permissions working-directory: framework run: cd dist && setfacl --restore=permissions-backup.acl continue-on-error: true - - name: Prepare Repository - working-directory: framework - run: mv dist .repo - - name: Install Dependencies - working-directory: framework - run: cd .repo && yarn install --check-files --frozen-lockfile - - name: Create python artifact - working-directory: framework - run: cd .repo && npx projen package:python - - name: Collect python Artifact - working-directory: framework - run: mv .repo/dist dist - name: Release uses: pypa/gh-action-pypi-publish@2f6f737ca5f74c637829c0f5c3acd0e29ea5e8bf #v1.8.11 with: - packages-dir: framework/dist/python/ + packages-dir: framework/dist/python/ \ No newline at end of file