From 51a20de10c91d549492d89caa245a028a5c02cdf Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Sat, 30 Jul 2022 19:54:26 -0400 Subject: [PATCH 01/13] Add license checker --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fd59576a5b471..c442e808c3d7de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,3 +90,13 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} unchecked: '1,5069' + + check-license-lines: + name: Check licenses + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + + - name: Check License Lines + uses: kt3k/license_checker@d12a6d90c58e30fefed09f2c4d03ba57f4c673a8 From 12f811389067e1762df415c836ee8103ed8019c4 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Sat, 30 Jul 2022 20:05:07 -0400 Subject: [PATCH 02/13] =?UTF-8?q?Voil=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .licenserc.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .licenserc.json diff --git a/.licenserc.json b/.licenserc.json new file mode 100644 index 00000000000000..fbb231bea83390 --- /dev/null +++ b/.licenserc.json @@ -0,0 +1,8 @@ +{ + "**/*.{js,ts,sol}": "// SPDX-License-Identifier: CC0-1.0", + "ignore": [ + "assets/eip-3267", + "assets/eip-4675", + "assets/eip-4886", + ] +} From 533d083c303e9f6b828791d63bcd6e62647b7ffb Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Sat, 30 Jul 2022 20:08:32 -0400 Subject: [PATCH 03/13] O o p s --- .licenserc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.licenserc.json b/.licenserc.json index fbb231bea83390..df771f704972ea 100644 --- a/.licenserc.json +++ b/.licenserc.json @@ -3,6 +3,6 @@ "ignore": [ "assets/eip-3267", "assets/eip-4675", - "assets/eip-4886", + "assets/eip-4886" ] } From bdc1bcb3d2ffd84603c4b756acf88eace830db3e Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Sat, 30 Jul 2022 20:16:27 -0400 Subject: [PATCH 04/13] Add a bunch of exceptions, because nothing is perfect --- .licenserc.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.licenserc.json b/.licenserc.json index df771f704972ea..05efb0a0ca934b 100644 --- a/.licenserc.json +++ b/.licenserc.json @@ -1,8 +1,18 @@ { "**/*.{js,ts,sol}": "// SPDX-License-Identifier: CC0-1.0", "ignore": [ + "assets/eip-712", "assets/eip-3267", + "assets/eip-3475", + "assets/eip-3525", + "assets/eip-4361", + "assets/eip-4400", + "assets/eip-4519", "assets/eip-4675", - "assets/eip-4886" + "assets/eip-4886", + "assets/eip-4907", + "assets/eip-4987", + "assets/eip-5006", + "assets/eip-5007" ] } From 7534f97f6840c25dcdadd72833247b28cd2d8e1e Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:50:27 -0400 Subject: [PATCH 05/13] Or I thought I had made that change --- .licenserc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.licenserc.json b/.licenserc.json index 05efb0a0ca934b..cb3603df9e253d 100644 --- a/.licenserc.json +++ b/.licenserc.json @@ -1,5 +1,5 @@ { - "**/*.{js,ts,sol}": "// SPDX-License-Identifier: CC0-1.0", + "**/*.{sol}": "// SPDX-License-Identifier: CC0-1.0", "ignore": [ "assets/eip-712", "assets/eip-3267", From d261332bb3ee297b3a95ffb9413e67a902ac5149 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Mon, 1 Aug 2022 11:38:25 -0400 Subject: [PATCH 06/13] If it works don't fix it --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c442e808c3d7de..e55a97d13b1c2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,5 +98,29 @@ jobs: - name: Checkout uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + - name: Get Changed Files + id: changed-files + uses: tj-actions/changed-files@6c44eb8294bb9c93d6118427f4ff8404b695e1d7 + + - name: Delete Unmodified Files + run: | + cd $GITHUB_WORKSPACE + mkdir all + shopt -s extglob dotglob + mv !(all) all + shopt -u dotglob + mkdir unchanged + cd all + for FILE in ${{ steps.changed-files.outputs.all_changed_files }}; do + [ -f ${FILE} ] && mkdir -p $(dirname "../unchanged/${FILE}") + [ -f ${FILE} ] && cp ${FILE} ../unchanged/${FILE} + done + cd .. + rm -rf all + cd unchanged + cp -r unchanged/* . + cd .. + rm -rf unchanged + - name: Check License Lines uses: kt3k/license_checker@d12a6d90c58e30fefed09f2c4d03ba57f4c673a8 From 51dcb8137b79a353b33c265ce368a54f11024098 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Mon, 1 Aug 2022 11:46:11 -0400 Subject: [PATCH 07/13] Bug :P --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e55a97d13b1c2e..a9d0a78f901865 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,6 @@ jobs: done cd .. rm -rf all - cd unchanged cp -r unchanged/* . cd .. rm -rf unchanged From f045a7a2d039d6de7b1a32b599f98cc13cbdf784 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Mon, 1 Aug 2022 11:46:36 -0400 Subject: [PATCH 08/13] Remove exceptions --- .licenserc.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.licenserc.json b/.licenserc.json index cb3603df9e253d..bdb5bf3e3b298d 100644 --- a/.licenserc.json +++ b/.licenserc.json @@ -1,18 +1,3 @@ { - "**/*.{sol}": "// SPDX-License-Identifier: CC0-1.0", - "ignore": [ - "assets/eip-712", - "assets/eip-3267", - "assets/eip-3475", - "assets/eip-3525", - "assets/eip-4361", - "assets/eip-4400", - "assets/eip-4519", - "assets/eip-4675", - "assets/eip-4886", - "assets/eip-4907", - "assets/eip-4987", - "assets/eip-5006", - "assets/eip-5007" - ] + "**/*.{sol}": "// SPDX-License-Identifier: CC0-1.0" } From 7f275ace81b1e867c9a876342f98193f42a8b88a Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Mon, 1 Aug 2022 12:31:43 -0400 Subject: [PATCH 09/13] Quick EIP-1 modification --- EIPS/eip-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EIPS/eip-1.md b/EIPS/eip-1.md index 15afc33ef311c8..f8316c51cf3df6 100644 --- a/EIPS/eip-1.md +++ b/EIPS/eip-1.md @@ -195,7 +195,7 @@ References to other EIPs should follow the format `EIP-N` where `N` is the EIP n ## Auxiliary Files -Images, diagrams and auxiliary files should be included in a subdirectory of the `assets` folder for that EIP as follows: `assets/eip-N` (where **N** is to be replaced with the EIP number). When linking to an image in the EIP, use relative links such as `../assets/eip-1/image.png`. +Images, diagrams and auxiliary files should be included in a subdirectory of the `assets` folder for that EIP as follows: `assets/eip-N` (where **N** is to be replaced with the EIP number). When linking to an image in the EIP, use relative links such as `../assets/eip-1/image.png`. These files must be in the public domain (`CC0`). Solidity files must use the SPDX Identifier `CC0-1.0`. ## Transferring EIP Ownership From 0f41e2937cd5b669339d32f6a67750c9fe4cf332 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Thu, 4 Aug 2022 08:35:59 -0400 Subject: [PATCH 10/13] You asked for it --- .github/workflows/ci.yml | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeb4bde040004b..b7fc076013c5b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,28 +98,9 @@ jobs: - name: Checkout uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - name: Get Changed Files + - name: Delete Unchanged Files id: changed-files - uses: tj-actions/changed-files@6c44eb8294bb9c93d6118427f4ff8404b695e1d7 - - - name: Delete Unmodified Files - run: | - cd $GITHUB_WORKSPACE - mkdir all - shopt -s extglob dotglob - mv !(all) all - shopt -u dotglob - mkdir unchanged - cd all - for FILE in ${{ steps.changed-files.outputs.all_changed_files }}; do - [ -f ${FILE} ] && mkdir -p $(dirname "../unchanged/${FILE}") - [ -f ${FILE} ] && cp ${FILE} ../unchanged/${FILE} - done - cd .. - rm -rf all - cp -r unchanged/* . - cd .. - rm -rf unchanged + uses: Pandapip1/delete-unchanged-files@0937c94da2e9f9f262bbf2035e75065a1fd04bcf - name: Check License Lines uses: kt3k/license_checker@d12a6d90c58e30fefed09f2c4d03ba57f4c673a8 From fa04c9cbcb1622404da913e29d1c80723c266e70 Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Thu, 11 Aug 2022 21:12:23 -0400 Subject: [PATCH 11/13] Update EIPS/eip-1.md Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com> --- EIPS/eip-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EIPS/eip-1.md b/EIPS/eip-1.md index d2946779791ee3..baae6cfb66535a 100644 --- a/EIPS/eip-1.md +++ b/EIPS/eip-1.md @@ -195,7 +195,7 @@ References to other EIPs should follow the format `EIP-N` where `N` is the EIP n ## Auxiliary Files -Images, diagrams and auxiliary files should be included in a subdirectory of the `assets` folder for that EIP as follows: `assets/eip-N` (where **N** is to be replaced with the EIP number). When linking to an image in the EIP, use relative links such as `../assets/eip-1/image.png`. These files must be in the public domain (`CC0`). Solidity files must use the SPDX Identifier `CC0-1.0`. +Images, diagrams and auxiliary files should be included in a subdirectory of the `assets` folder for that EIP as follows: `assets/eip-N` (where **N** is to be replaced with the EIP number). When linking to an image in the EIP, use relative links such as `../assets/eip-1/image.png`. These files must be released into the public domain (or as close as is legally possible) using [CC0](../LICENSE.md). Solidity files must use the SPDX Identifier `CC0-1.0`. ## Transferring EIP Ownership From c8df641f8e5b7131d91555f6690fffb69d6851ce Mon Sep 17 00:00:00 2001 From: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> Date: Wed, 19 Oct 2022 09:58:30 -0400 Subject: [PATCH 12/13] Allow bypass --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcc85ccc2e6304..9ec776befe8566 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,3 +103,4 @@ jobs: - name: Check License Lines uses: kt3k/license_checker@d12a6d90c58e30fefed09f2c4d03ba57f4c673a8 + continue-on-error: true From 7568e6d81c8db35409d2bb1177734c9f0a3f68b4 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 2 Jun 2023 08:33:12 -0400 Subject: [PATCH 13/13] testing: does this syntax work --- .licenserc.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.licenserc.json b/.licenserc.json index bdb5bf3e3b298d..3d86c435372686 100644 --- a/.licenserc.json +++ b/.licenserc.json @@ -1,3 +1,5 @@ { - "**/*.{sol}": "// SPDX-License-Identifier: CC0-1.0" + "**/*.{sol}": [ + "// SPDX-License-Identifier: CC0-1.0" + ] }