From 6d28e46e17ce3ccad39f4160f89e1ad56f6a0e62 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:09:45 -0600 Subject: [PATCH 01/73] Test fix --- .github/workflows/tokens-build.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index cec5e74e..ad4ab4e2 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -29,12 +29,24 @@ jobs: - name: Build tokens run: | yarn tokens:build - - name: Commit latest figma tokens - working-directory: packages/tokens + - name: Prepare commit run: | git config --global user.name 'VA Automation Bot' git config --global user.email 'va-mobileapp@adhocteam.us' git pull git add -f figma/ + - name: Check figma diff + id: diff + working-directory: packages/tokens + run: | + git commit --dry-run + - name: No changes to figma tokens + if: steps.diff.conclusion == 'failure' + run: | + echo No changes to figma tokens + - name: Commit latest figma tokens + if: steps.diff.conclusion == 'success' + working-directory: packages/tokens + run: | git commit -m 'Build latest figma tokens' git push From 787691a1bad37c03b6ee87414b79c96ffbe1e206 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:15:36 -0600 Subject: [PATCH 02/73] Quick fix --- .github/workflows/tokens-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index ad4ab4e2..f115fe35 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -30,6 +30,7 @@ jobs: run: | yarn tokens:build - name: Prepare commit + working-directory: packages/tokens run: | git config --global user.name 'VA Automation Bot' git config --global user.email 'va-mobileapp@adhocteam.us' From aa19643a7a72c51dbda1a9e82b9dac5d264b40de Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:22:22 -0600 Subject: [PATCH 03/73] Next fix test --- .github/workflows/tokens-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index f115fe35..9fc9964d 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -42,11 +42,11 @@ jobs: run: | git commit --dry-run - name: No changes to figma tokens - if: steps.diff.conclusion == 'failure' + if: failure() && steps.diff.conclusion == 'failure' run: | echo No changes to figma tokens - name: Commit latest figma tokens - if: steps.diff.conclusion == 'success' + if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | git commit -m 'Build latest figma tokens' From 8f6b3b8426b488fa2931775937fe3b8960c172ff Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:47:13 -0600 Subject: [PATCH 04/73] Another test fix --- .github/workflows/tokens-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 9fc9964d..35ba5a40 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,6 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest + continue-on-error: diff steps: - name: Checkout repo uses: actions/checkout@v4 From e17e06af8d6779b7c17e25612387347629289cbd Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:48:45 -0600 Subject: [PATCH 05/73] Happy GHA? --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 35ba5a40..cf664214 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: diff + continue-on-error: tokens-build.steps.diff steps: - name: Checkout repo uses: actions/checkout@v4 From cf6ef922ab54ce322126718fb41d7be7b183ceaa Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:49:57 -0600 Subject: [PATCH 06/73] ??? --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index cf664214..73ce5d68 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: tokens-build.steps.diff + continue-on-error: ${{ tokens-build.steps.diff }} steps: - name: Checkout repo uses: actions/checkout@v4 From 75945b76f4755123d16f42fbe1e97ea9599ab02a Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:51:05 -0600 Subject: [PATCH 07/73] ????? --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 73ce5d68..37e0686d 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: ${{ tokens-build.steps.diff }} + continue-on-error: ${{ jobs.tokens-build.steps.diff }} steps: - name: Checkout repo uses: actions/checkout@v4 From fd7a80a2a31656fdd6c9300af6b792327c2e86c0 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:52:22 -0600 Subject: [PATCH 08/73] Last try --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 37e0686d..43bb1713 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: ${{ jobs.tokens-build.steps.diff }} + continue-on-error: ${{ steps.diff }} steps: - name: Checkout repo uses: actions/checkout@v4 From a7fd13350ea911ed2b5e26c70a4b2a15f16f11a2 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:53:38 -0600 Subject: [PATCH 09/73] Actual last try --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 43bb1713..208dc6b1 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: ${{ steps.diff }} + continue-on-error: ${{ diff }} steps: - name: Checkout repo uses: actions/checkout@v4 From 26ced32d81c1db1d70efe605394e2845326a61a4 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 15:56:00 -0600 Subject: [PATCH 10/73] Just checking --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 208dc6b1..53136446 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: ${{ diff }} + continue-on-error: true steps: - name: Checkout repo uses: actions/checkout@v4 From 1612581239366b32a9e270545520d012f75e1b35 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:00:40 -0600 Subject: [PATCH 11/73] Remove figma, another test --- packages/tokens/figma/color.json | 94 -------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From 54ce9d28b08355ec6b8a87608da0d9e2e6117b8d Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:00:51 -0600 Subject: [PATCH 12/73] Another test I said git --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 53136446..b40c599c 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,7 +12,6 @@ on: jobs: tokens-build: runs-on: ubuntu-latest - continue-on-error: true steps: - name: Checkout repo uses: actions/checkout@v4 @@ -39,6 +38,7 @@ jobs: git add -f figma/ - name: Check figma diff id: diff + continue-on-error: true working-directory: packages/tokens run: | git commit --dry-run From 7c41110f4462c2a522fecf236539bd0d394af9a4 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:06:27 -0600 Subject: [PATCH 13/73] Making progress, next test --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index b40c599c..068e496b 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -43,7 +43,7 @@ jobs: run: | git commit --dry-run - name: No changes to figma tokens - if: failure() && steps.diff.conclusion == 'failure' + if: success() || failure() || steps.diff.conclusion == 'failure' run: | echo No changes to figma tokens - name: Commit latest figma tokens From 05699d5652f441a3e3bfd9862f53e181d2928721 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:10:36 -0600 Subject: [PATCH 14/73] Fix to the fix before it broke testing --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 068e496b..da7916b3 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -43,7 +43,7 @@ jobs: run: | git commit --dry-run - name: No changes to figma tokens - if: success() || failure() || steps.diff.conclusion == 'failure' + if: failure() || steps.diff.conclusion == 'failure' run: | echo No changes to figma tokens - name: Commit latest figma tokens From fead29d6f13e3afeb8f5265c4383cc0386b85c26 Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Fri, 15 Dec 2023 22:12:12 +0000 Subject: [PATCH 15/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From c8ab8f12db40caf3be60dfe89754b90984d01c7d Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:24:50 -0600 Subject: [PATCH 16/73] Experimental fix --- .github/workflows/tokens-build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index da7916b3..8627fb6d 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -12,6 +12,7 @@ on: jobs: tokens-build: runs-on: ubuntu-latest + continue-on-error: true steps: - name: Checkout repo uses: actions/checkout@v4 @@ -38,7 +39,6 @@ jobs: git add -f figma/ - name: Check figma diff id: diff - continue-on-error: true working-directory: packages/tokens run: | git commit --dry-run @@ -52,3 +52,13 @@ jobs: run: | git commit -m 'Build latest figma tokens' git push + + tokens-build-success: + runs-on: ubuntu-latest + steps: + - name: Tokens Build Succeeded + if: jobs.tokens-build.steps.diff.conclusion == 'success' + echo Great success! + - name: Tokens Build Failure + if: failure() || jobs.tokens-build.steps.diff.conclusion == 'failure' + run: exit 1 \ No newline at end of file From f1ed844b701ecf42a9c34f2fcf77721c8a224ea7 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:25:52 -0600 Subject: [PATCH 17/73] Format fix --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 8627fb6d..8d18455a 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -58,7 +58,8 @@ jobs: steps: - name: Tokens Build Succeeded if: jobs.tokens-build.steps.diff.conclusion == 'success' - echo Great success! + run: | + echo Great success! - name: Tokens Build Failure if: failure() || jobs.tokens-build.steps.diff.conclusion == 'failure' run: exit 1 \ No newline at end of file From 1ac423fbcd44114afbb90374217d0d35d1f2af45 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:28:02 -0600 Subject: [PATCH 18/73] Run sequentially plz --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 8d18455a..dcbc771a 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -54,10 +54,11 @@ jobs: git push tokens-build-success: + needs: tokens-build runs-on: ubuntu-latest steps: - name: Tokens Build Succeeded - if: jobs.tokens-build.steps.diff.conclusion == 'success' + if: tokens-build.steps.diff.conclusion == 'success' run: | echo Great success! - name: Tokens Build Failure From 32169ced77b38e7f031bb7b4acfd5d752f2fd26f Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 16:32:09 -0600 Subject: [PATCH 19/73] This work? --- .github/workflows/tokens-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index dcbc771a..16b0cbc6 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -11,6 +11,7 @@ on: jobs: tokens-build: + id: tokens-build runs-on: ubuntu-latest continue-on-error: true steps: From 346213f5bd9cb96855703f936436751dd3bb20fc Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:29:31 -0600 Subject: [PATCH 20/73] Test with second job --- .github/workflows/tokens-build.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 16b0cbc6..d17cccf9 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -9,11 +9,17 @@ on: branches: - main +env: + BUILD_SUCCESS: true + jobs: tokens-build: id: tokens-build runs-on: ubuntu-latest continue-on-error: true + # outputs: + # figma-noDiff: steps.noDiff.outputs.test + # figma-built: steps.built.output.test steps: - name: Checkout repo uses: actions/checkout@v4 @@ -43,25 +49,33 @@ jobs: working-directory: packages/tokens run: | git commit --dry-run - - name: No changes to figma tokens - if: failure() || steps.diff.conclusion == 'failure' - run: | - echo No changes to figma tokens + # - name: No changes to figma tokens + # id: noDiff + # if: failure() || steps.diff.conclusion == 'failure' + # run: | + # echo No changes to figma tokens + # run: | + # echo 'test=noDiff' >> 'No changes to figma tokens' - name: Commit latest figma tokens + id: built if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | git commit -m 'Build latest figma tokens' git push + echo 'test=built' >> 'Built latest figma tokens' + - name: Set success/fail + if: failure() && steps.built.conclusion == 'failure' + run: echo "BUILD_SUCCESS=false" >> "$GITHUB_ENV" tokens-build-success: needs: tokens-build runs-on: ubuntu-latest steps: - name: Tokens Build Succeeded - if: tokens-build.steps.diff.conclusion == 'success' - run: | - echo Great success! + if: $BUILD_SUCCESS == 'true' + run: echo Great success! - name: Tokens Build Failure - if: failure() || jobs.tokens-build.steps.diff.conclusion == 'failure' + # if: needs.tokens-build.outputs.figma-built + if: $BUILD_SUCCESS == 'false' run: exit 1 \ No newline at end of file From b60afc9f0b6996df6dcb917e560124b4b44c843d Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:30:23 -0600 Subject: [PATCH 21/73] Whoops --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index d17cccf9..2d22fcb8 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -14,7 +14,7 @@ env: jobs: tokens-build: - id: tokens-build + # id: tokens-build runs-on: ubuntu-latest continue-on-error: true # outputs: From 93c925fadf0d7ebdac7d5acb0577350736e81729 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:33:59 -0600 Subject: [PATCH 22/73] Format like this? --- .github/workflows/tokens-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 2d22fcb8..c8fa1ec3 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -73,9 +73,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Tokens Build Succeeded - if: $BUILD_SUCCESS == 'true' + if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: $BUILD_SUCCESS == 'false' + if: ${{ vars.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From c4461f2c4fbee90b99b082f9c33c49ab6e72b279 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:34:29 -0600 Subject: [PATCH 23/73] Split test --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c8fa1ec3..9e3031db 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -77,5 +77,5 @@ jobs: run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: ${{ vars.BUILD_SUCCESS == 'false' }} + if: ${{ BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From 97074dc18db3b587bdf5e0a3453645328e1eedfe Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:35:29 -0600 Subject: [PATCH 24/73] Better perhaps --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 9e3031db..c8fa1ec3 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -77,5 +77,5 @@ jobs: run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: ${{ BUILD_SUCCESS == 'false' }} + if: ${{ vars.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From f017a00d5e913144ba79847f5cad45b3833332ce Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:39:17 -0600 Subject: [PATCH 25/73] Again with node present? --- .github/workflows/tokens-build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c8fa1ec3..c19f798d 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -72,6 +72,13 @@ jobs: needs: tokens-build runs-on: ubuntu-latest steps: + - name: Use Node.js 18.x + uses: actions/setup-node@v3 + with: + registry-url: https://registry.npmjs.org/ + node-version-file: .nvmrc + cache: yarn + cache-dependency-path: yarn.lock - name: Tokens Build Succeeded if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! From af1d519a14daa03fe391431e515c9ce5f04e16f8 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:45:28 -0600 Subject: [PATCH 26/73] Why are the ifs not running --- .github/workflows/tokens-build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c19f798d..ff78e915 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -61,24 +61,22 @@ jobs: if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | + echo $var.BUILD_SUCCESS + echo $BUILD_SUCCESS + echo '$BUILD_SUCCESS' git commit -m 'Build latest figma tokens' git push echo 'test=built' >> 'Built latest figma tokens' - name: Set success/fail if: failure() && steps.built.conclusion == 'failure' - run: echo "BUILD_SUCCESS=false" >> "$GITHUB_ENV" + run: echo 'BUILD_SUCCESS=false' >> '$GITHUB_ENV' tokens-build-success: needs: tokens-build runs-on: ubuntu-latest steps: - - name: Use Node.js 18.x - uses: actions/setup-node@v3 - with: - registry-url: https://registry.npmjs.org/ - node-version-file: .nvmrc - cache: yarn - cache-dependency-path: yarn.lock + - name: Test output + run: echo $var.BUILD_SUCCESS - name: Tokens Build Succeeded if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! From 21c0564bf8ac40c1a802eefcb3a9029c32a89a11 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:49:21 -0600 Subject: [PATCH 27/73] More variable --- .github/workflows/tokens-build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index ff78e915..41c9248a 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -48,6 +48,9 @@ jobs: id: diff working-directory: packages/tokens run: | + echo $var.BUILD_SUCCESS + echo $BUILD_SUCCESS + echo '$BUILD_SUCCESS' git commit --dry-run # - name: No changes to figma tokens # id: noDiff @@ -61,9 +64,6 @@ jobs: if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | - echo $var.BUILD_SUCCESS - echo $BUILD_SUCCESS - echo '$BUILD_SUCCESS' git commit -m 'Build latest figma tokens' git push echo 'test=built' >> 'Built latest figma tokens' @@ -76,7 +76,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Test output - run: echo $var.BUILD_SUCCESS + run: | + echo ${{ $var.BUILD_SUCCESS }} + echo ${{ vars.BUILD_SUCCESS == 'true' }} + ${{ vars.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! From 0658019008c408566fe709927f9744f80b2733f2 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:50:18 -0600 Subject: [PATCH 28/73] Typo --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 41c9248a..5db3218b 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -77,7 +77,7 @@ jobs: steps: - name: Test output run: | - echo ${{ $var.BUILD_SUCCESS }} + echo ${{ var.BUILD_SUCCESS }} echo ${{ vars.BUILD_SUCCESS == 'true' }} ${{ vars.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded From aa475fe9903a88e5d0c1d123c2c81d5fdb12aead Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:51:33 -0600 Subject: [PATCH 29/73] Another typo --- .github/workflows/tokens-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 5db3218b..7150ad0c 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -48,7 +48,7 @@ jobs: id: diff working-directory: packages/tokens run: | - echo $var.BUILD_SUCCESS + echo $vars.BUILD_SUCCESS echo $BUILD_SUCCESS echo '$BUILD_SUCCESS' git commit --dry-run @@ -77,7 +77,7 @@ jobs: steps: - name: Test output run: | - echo ${{ var.BUILD_SUCCESS }} + echo ${{ vars.BUILD_SUCCESS }} echo ${{ vars.BUILD_SUCCESS == 'true' }} ${{ vars.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded From 365445c804d499a72b5cffd369b9f1a566a934d0 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:54:57 -0600 Subject: [PATCH 30/73] Progress --- .github/workflows/tokens-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 7150ad0c..5d131df5 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -77,9 +77,10 @@ jobs: steps: - name: Test output run: | - echo ${{ vars.BUILD_SUCCESS }} - echo ${{ vars.BUILD_SUCCESS == 'true' }} - ${{ vars.BUILD_SUCCESS == 'false' }} + echo $BUILD_SUCCESS + echo ${{ BUILD_SUCCESS }} + echo ${{ BUILD_SUCCESS == 'true' }} + echo ${{ BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! From 49ede21b134a6e17bc84e9e4139ec6de06bf6653 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:56:06 -0600 Subject: [PATCH 31/73] Hmmm --- .github/workflows/tokens-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 5d131df5..c9ab2070 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -78,13 +78,13 @@ jobs: - name: Test output run: | echo $BUILD_SUCCESS - echo ${{ BUILD_SUCCESS }} - echo ${{ BUILD_SUCCESS == 'true' }} - echo ${{ BUILD_SUCCESS == 'false' }} + echo ${{ $BUILD_SUCCESS }} + echo ${{ $BUILD_SUCCESS == 'true' }} + echo ${{ $BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded - if: ${{ vars.BUILD_SUCCESS == 'true' }} + if: ${{ $BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: ${{ vars.BUILD_SUCCESS == 'false' }} + if: ${{ $BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From fd46b2a74994957877ddda7c003703b6a4680c25 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:57:32 -0600 Subject: [PATCH 32/73] Sigh --- .github/workflows/tokens-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c9ab2070..c3ddbe62 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -78,9 +78,9 @@ jobs: - name: Test output run: | echo $BUILD_SUCCESS - echo ${{ $BUILD_SUCCESS }} - echo ${{ $BUILD_SUCCESS == 'true' }} - echo ${{ $BUILD_SUCCESS == 'false' }} + echo ${{ vars.BUILD_SUCCESS }} + echo ${{ vars.BUILD_SUCCESS == 'true' }} + echo ${{ vars.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded if: ${{ $BUILD_SUCCESS == 'true' }} run: echo Great success! From c16e220383880afd70e9251cf2b8e433b1b87214 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 17:58:39 -0600 Subject: [PATCH 33/73] Context based referencing of vars is awful --- .github/workflows/tokens-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c3ddbe62..89b17adc 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -82,9 +82,9 @@ jobs: echo ${{ vars.BUILD_SUCCESS == 'true' }} echo ${{ vars.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded - if: ${{ $BUILD_SUCCESS == 'true' }} + if: ${{ vars.BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: ${{ $BUILD_SUCCESS == 'false' }} + if: ${{ vars.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From ee72896f4703ac758c7d8707b6dfd86443dd819c Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:03:43 -0600 Subject: [PATCH 34/73] Does env work instead? --- .github/workflows/tokens-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 89b17adc..ef1003c2 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -78,13 +78,13 @@ jobs: - name: Test output run: | echo $BUILD_SUCCESS - echo ${{ vars.BUILD_SUCCESS }} - echo ${{ vars.BUILD_SUCCESS == 'true' }} - echo ${{ vars.BUILD_SUCCESS == 'false' }} + echo ${{ env.BUILD_SUCCESS }} + echo ${{ env.BUILD_SUCCESS == 'true' }} + echo ${{ env.BUILD_SUCCESS == 'false' }} - name: Tokens Build Succeeded - if: ${{ vars.BUILD_SUCCESS == 'true' }} + if: ${{ env.BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure # if: needs.tokens-build.outputs.figma-built - if: ${{ vars.BUILD_SUCCESS == 'false' }} + if: ${{ env.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From 5070b86f9cb35b94ae19b4ba0d4c39a502686522 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:33:24 -0600 Subject: [PATCH 35/73] Maybe working but messy --- packages/tokens/figma/color.json | 94 -------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From 3482862520e41332bfd1fbd67c4ced191107f892 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:33:57 -0600 Subject: [PATCH 36/73] 2nd file that wasn't staged --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index ef1003c2..956701c3 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -14,6 +14,7 @@ env: jobs: tokens-build: + name: Build (fails by design) # id: tokens-build runs-on: ubuntu-latest continue-on-error: true @@ -64,6 +65,7 @@ jobs: if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | + exit 1 git commit -m 'Build latest figma tokens' git push echo 'test=built' >> 'Built latest figma tokens' @@ -85,6 +87,5 @@ jobs: if: ${{ env.BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure - # if: needs.tokens-build.outputs.figma-built if: ${{ env.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From 2efefbd9b73910196f5d0e8b850637ac33693e49 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:39:20 -0600 Subject: [PATCH 37/73] Intentional failure take 2 --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 956701c3..fc28fe5e 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -71,9 +71,10 @@ jobs: echo 'test=built' >> 'Built latest figma tokens' - name: Set success/fail if: failure() && steps.built.conclusion == 'failure' - run: echo 'BUILD_SUCCESS=false' >> '$GITHUB_ENV' + run: echo 'BUILD_SUCCESS=false' >> $GITHUB_ENV tokens-build-success: + name: Build Process Success/Failure needs: tokens-build runs-on: ubuntu-latest steps: From 4ef2fa365134fc31cb5100e5280e087ecfac7b50 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:45:59 -0600 Subject: [PATCH 38/73] GHA doc sucks so much --- .github/workflows/tokens-build.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index fc28fe5e..d28765eb 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -71,7 +71,21 @@ jobs: echo 'test=built' >> 'Built latest figma tokens' - name: Set success/fail if: failure() && steps.built.conclusion == 'failure' - run: echo 'BUILD_SUCCESS=false' >> $GITHUB_ENV + run: | + echo $BUILD_SUCCESS + echo 'BUILD_SUCCESS=false' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + echo '{BUILD_SUCCESS}=false' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + echo '{BUILD_SUCCESS}={false}' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + echo 'env.BUILD_SUCCESS=false' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + echo '{env.BUILD_SUCCESS}=false' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + echo '{env.BUILD_SUCCESS}={false}' >> '$GITHUB_ENV' + echo $BUILD_SUCCESS + tokens-build-success: name: Build Process Success/Failure From 3f1edf94ee204b23b09fc07436205e0b5d44c7a1 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:50:50 -0600 Subject: [PATCH 39/73] Any of these formats set the var? --- .github/workflows/tokens-build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index d28765eb..10705d07 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -85,6 +85,18 @@ jobs: echo $BUILD_SUCCESS echo '{env.BUILD_SUCCESS}={false}' >> '$GITHUB_ENV' echo $BUILD_SUCCESS + echo 'BUILD_SUCCESS=false' >> $GITHUB_ENV + echo $BUILD_SUCCESS + echo '{BUILD_SUCCESS}=false' >> $GITHUB_ENV + echo $BUILD_SUCCESS + echo '{BUILD_SUCCESS}={false}' >> $GITHUB_ENV + echo $BUILD_SUCCESS + echo 'env.BUILD_SUCCESS=false' >> $GITHUB_ENV + echo $BUILD_SUCCESS + echo '{env.BUILD_SUCCESS}=false' >> $GITHUB_ENV + echo $BUILD_SUCCESS + echo '{env.BUILD_SUCCESS}={false}' >> $GITHUB_ENV + echo $BUILD_SUCCESS tokens-build-success: From 12429ef2eb07769bff52d741d9a3dad5e4b27b82 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 18:57:47 -0600 Subject: [PATCH 40/73] Uggg --- .github/workflows/tokens-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 10705d07..2c2c4cb1 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -10,7 +10,7 @@ on: - main env: - BUILD_SUCCESS: true + BUILD_SUCCESS: jobs: tokens-build: @@ -49,9 +49,8 @@ jobs: id: diff working-directory: packages/tokens run: | - echo $vars.BUILD_SUCCESS echo $BUILD_SUCCESS - echo '$BUILD_SUCCESS' + echo "BUILD_SUCCESS=true" >> $GITHUB_ENV git commit --dry-run # - name: No changes to figma tokens # id: noDiff @@ -65,6 +64,7 @@ jobs: if: success() && steps.diff.conclusion == 'success' working-directory: packages/tokens run: | + echo $BUILD_SUCCESS exit 1 git commit -m 'Build latest figma tokens' git push From 678ba933f2947089a76135e9890c5485f501e39f Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:08:47 -0600 Subject: [PATCH 41/73] Kind of works, but env variables don't pass jobs--could convert to GITHUB_OUTPUT --- .github/workflows/tokens-build.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 2c2c4cb1..27352d44 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -73,31 +73,6 @@ jobs: if: failure() && steps.built.conclusion == 'failure' run: | echo $BUILD_SUCCESS - echo 'BUILD_SUCCESS=false' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo '{BUILD_SUCCESS}=false' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo '{BUILD_SUCCESS}={false}' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo 'env.BUILD_SUCCESS=false' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo '{env.BUILD_SUCCESS}=false' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo '{env.BUILD_SUCCESS}={false}' >> '$GITHUB_ENV' - echo $BUILD_SUCCESS - echo 'BUILD_SUCCESS=false' >> $GITHUB_ENV - echo $BUILD_SUCCESS - echo '{BUILD_SUCCESS}=false' >> $GITHUB_ENV - echo $BUILD_SUCCESS - echo '{BUILD_SUCCESS}={false}' >> $GITHUB_ENV - echo $BUILD_SUCCESS - echo 'env.BUILD_SUCCESS=false' >> $GITHUB_ENV - echo $BUILD_SUCCESS - echo '{env.BUILD_SUCCESS}=false' >> $GITHUB_ENV - echo $BUILD_SUCCESS - echo '{env.BUILD_SUCCESS}={false}' >> $GITHUB_ENV - echo $BUILD_SUCCESS - tokens-build-success: name: Build Process Success/Failure @@ -114,5 +89,5 @@ jobs: if: ${{ env.BUILD_SUCCESS == 'true' }} run: echo Great success! - name: Tokens Build Failure - if: ${{ env.BUILD_SUCCESS == 'false' }} + if: success() || ${{ env.BUILD_SUCCESS == 'false' }} run: exit 1 \ No newline at end of file From 26ed6458b04349f950fd9e5a06e68fc8353f2bec Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:14:08 -0600 Subject: [PATCH 42/73] New method --- .github/workflows/tokens-build.yml | 45 ++++++++---------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 27352d44..3f4234ee 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -10,7 +10,7 @@ on: - main env: - BUILD_SUCCESS: + FILES_MODIFIED: jobs: tokens-build: @@ -49,45 +49,24 @@ jobs: id: diff working-directory: packages/tokens run: | - echo $BUILD_SUCCESS - echo "BUILD_SUCCESS=true" >> $GITHUB_ENV - git commit --dry-run - # - name: No changes to figma tokens - # id: noDiff - # if: failure() || steps.diff.conclusion == 'failure' - # run: | - # echo No changes to figma tokens + echo $FILES_MODIFIED + echo "FILES_MODIFIED=(git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l)" >> $GITHUB_ENV + - name: No changes to figma tokens + if: ${{ env.FILES_MODIFIED == '0' }} + run: | + echo $FILES_MODIFIED + echo No changes to figma tokens # run: | # echo 'test=noDiff' >> 'No changes to figma tokens' - name: Commit latest figma tokens id: built - if: success() && steps.diff.conclusion == 'success' + if: ${{ env.FILES_MODIFIED == '1' }} working-directory: packages/tokens run: | - echo $BUILD_SUCCESS + echo $FILES_MODIFIED exit 1 git commit -m 'Build latest figma tokens' git push - echo 'test=built' >> 'Built latest figma tokens' - name: Set success/fail - if: failure() && steps.built.conclusion == 'failure' - run: | - echo $BUILD_SUCCESS - - tokens-build-success: - name: Build Process Success/Failure - needs: tokens-build - runs-on: ubuntu-latest - steps: - - name: Test output - run: | - echo $BUILD_SUCCESS - echo ${{ env.BUILD_SUCCESS }} - echo ${{ env.BUILD_SUCCESS == 'true' }} - echo ${{ env.BUILD_SUCCESS == 'false' }} - - name: Tokens Build Succeeded - if: ${{ env.BUILD_SUCCESS == 'true' }} - run: echo Great success! - - name: Tokens Build Failure - if: success() || ${{ env.BUILD_SUCCESS == 'false' }} - run: exit 1 \ No newline at end of file + if: ${{ env.FILES_MODIFIED >= '2' }} + run: fail 1 \ No newline at end of file From 6b0f89faa7f79f839da03e4c975b3489f5f6a5f9 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:17:28 -0600 Subject: [PATCH 43/73] Try this --- .github/workflows/tokens-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 3f4234ee..94615f15 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -17,7 +17,7 @@ jobs: name: Build (fails by design) # id: tokens-build runs-on: ubuntu-latest - continue-on-error: true + # continue-on-error: true # outputs: # figma-noDiff: steps.noDiff.outputs.test # figma-built: steps.built.output.test @@ -50,7 +50,7 @@ jobs: working-directory: packages/tokens run: | echo $FILES_MODIFIED - echo "FILES_MODIFIED=(git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l)" >> $GITHUB_ENV + echo "FILES_MODIFIED=git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l" >> $GITHUB_ENV - name: No changes to figma tokens if: ${{ env.FILES_MODIFIED == '0' }} run: | From 02eaff87deaf5aed0b7f9dc37225208ee9dc584d Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:21:01 -0600 Subject: [PATCH 44/73] does the git command work in GHA --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 94615f15..de55923e 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -50,7 +50,7 @@ jobs: working-directory: packages/tokens run: | echo $FILES_MODIFIED - echo "FILES_MODIFIED=git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l" >> $GITHUB_ENV + git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l - name: No changes to figma tokens if: ${{ env.FILES_MODIFIED == '0' }} run: | From 5e00ea3b9fe49170018348952018a77d742f764b Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:24:40 -0600 Subject: [PATCH 45/73] How about this? --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index de55923e..a7549e53 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -50,7 +50,8 @@ jobs: working-directory: packages/tokens run: | echo $FILES_MODIFIED - git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l + git status --porcelain 2>/dev/null | egrep "^(M| M|D| D)" | wc -l + echo "FILES_MODIFIED=$(git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l)" >> $GITHUB_ENV - name: No changes to figma tokens if: ${{ env.FILES_MODIFIED == '0' }} run: | From 57b5bc49d1c4af06b7fac95c0156c1c8e02f20d0 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:31:31 -0600 Subject: [PATCH 46/73] May have it now --- .github/workflows/tokens-build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index a7549e53..1ac9db0a 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -45,20 +45,19 @@ jobs: git config --global user.email 'va-mobileapp@adhocteam.us' git pull git add -f figma/ + git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l - name: Check figma diff id: diff working-directory: packages/tokens run: | echo $FILES_MODIFIED - git status --porcelain 2>/dev/null | egrep "^(M| M|D| D)" | wc -l - echo "FILES_MODIFIED=$(git status --porcelain 2>/dev/null| egrep "^(M| M|D| D)" | wc -l)" >> $GITHUB_ENV + git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l + echo "FILES_MODIFIED=$(git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l)" >> $GITHUB_ENV - name: No changes to figma tokens if: ${{ env.FILES_MODIFIED == '0' }} run: | echo $FILES_MODIFIED echo No changes to figma tokens - # run: | - # echo 'test=noDiff' >> 'No changes to figma tokens' - name: Commit latest figma tokens id: built if: ${{ env.FILES_MODIFIED == '1' }} From b8897cf63e6ae6cc9ac8807a65da62d4e12f61f4 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:49:31 -0600 Subject: [PATCH 47/73] Refining --- .github/workflows/tokens-build.yml | 33 +++++++++--------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 1ac9db0a..c966306f 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -10,17 +10,11 @@ on: - main env: - FILES_MODIFIED: + FIGMA_FILES_CHANGED: jobs: tokens-build: - name: Build (fails by design) - # id: tokens-build runs-on: ubuntu-latest - # continue-on-error: true - # outputs: - # figma-noDiff: steps.noDiff.outputs.test - # figma-built: steps.built.output.test steps: - name: Checkout repo uses: actions/checkout@v4 @@ -36,8 +30,7 @@ jobs: cache-dependency-path: yarn.lock - run: yarn install - name: Build tokens - run: | - yarn tokens:build + run: yarn tokens:build - name: Prepare commit working-directory: packages/tokens run: | @@ -45,28 +38,22 @@ jobs: git config --global user.email 'va-mobileapp@adhocteam.us' git pull git add -f figma/ - git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l - - name: Check figma diff - id: diff + - name: Check for `figma` diff working-directory: packages/tokens run: | - echo $FILES_MODIFIED - git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l - echo "FILES_MODIFIED=$(git status --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l)" >> $GITHUB_ENV + echo $FIGMA_FILES_CHANGED + git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l + echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l)" >> $GITHUB_ENV - name: No changes to figma tokens - if: ${{ env.FILES_MODIFIED == '0' }} + if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: | - echo $FILES_MODIFIED + echo $FIGMA_FILES_CHANGED echo No changes to figma tokens - name: Commit latest figma tokens - id: built - if: ${{ env.FILES_MODIFIED == '1' }} + if: ${{ env.FIGMA_FILES_CHANGED >= 1 }} working-directory: packages/tokens run: | - echo $FILES_MODIFIED + echo $FIGMA_FILES_CHANGED exit 1 git commit -m 'Build latest figma tokens' git push - - name: Set success/fail - if: ${{ env.FILES_MODIFIED >= '2' }} - run: fail 1 \ No newline at end of file From efba08e7ef4a65e83d071c37e8172304810b0c6b Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 19:59:10 -0600 Subject: [PATCH 48/73] Testing files in figma folder --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++ packages/tokens/figma/iBelieve.json | 0 packages/tokens/figma/testFile2.json | 0 3 files changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json create mode 100644 packages/tokens/figma/iBelieve.json create mode 100644 packages/tokens/figma/testFile2.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} diff --git a/packages/tokens/figma/iBelieve.json b/packages/tokens/figma/iBelieve.json new file mode 100644 index 00000000..e69de29b diff --git a/packages/tokens/figma/testFile2.json b/packages/tokens/figma/testFile2.json new file mode 100644 index 00000000..e69de29b From 27ace8971b78787235e094c3fc090d1dfdc476da Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 20:09:54 -0600 Subject: [PATCH 49/73] Getting there --- packages/tokens/figma/{iBelieve.json => iBeliever copy.json} | 0 packages/tokens/figma/iBeliever.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename packages/tokens/figma/{iBelieve.json => iBeliever copy.json} (100%) create mode 100644 packages/tokens/figma/iBeliever.json diff --git a/packages/tokens/figma/iBelieve.json b/packages/tokens/figma/iBeliever copy.json similarity index 100% rename from packages/tokens/figma/iBelieve.json rename to packages/tokens/figma/iBeliever copy.json diff --git a/packages/tokens/figma/iBeliever.json b/packages/tokens/figma/iBeliever.json new file mode 100644 index 00000000..e69de29b From ad555529c59c143419dc5169be9abc620f15a9a9 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 20:10:09 -0600 Subject: [PATCH 50/73] Getting there --- .github/workflows/tokens-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index c966306f..5100b90b 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -42,14 +42,14 @@ jobs: working-directory: packages/tokens run: | echo $FIGMA_FILES_CHANGED - git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l - echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|D| D)" | wc -l)" >> $GITHUB_ENV - - name: No changes to figma tokens + git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l + echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l)" | wc -l)" >> $GITHUB_ENV + - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: | echo $FIGMA_FILES_CHANGED echo No changes to figma tokens - - name: Commit latest figma tokens + - name: Commit latest `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED >= 1 }} working-directory: packages/tokens run: | From 2eb5d217f3b7031f33b37e5b653ebfa84ae46e7b Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 20:12:36 -0600 Subject: [PATCH 51/73] Copy/pasta malfunction --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 5100b90b..bda4794e 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -43,7 +43,7 @@ jobs: run: | echo $FIGMA_FILES_CHANGED git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l - echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l)" | wc -l)" >> $GITHUB_ENV + echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: | From 9932271f96fe5af95016abf7ec9b87157f82dbf2 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 20:24:28 -0600 Subject: [PATCH 52/73] Does this work better --- .github/workflows/tokens-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index bda4794e..52ada893 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -42,8 +42,9 @@ jobs: working-directory: packages/tokens run: | echo $FIGMA_FILES_CHANGED + git diff --shortstat figma | wc -l git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l - echo "FIGMA_FILES_CHANGED=$(git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l)" >> $GITHUB_ENV + echo "FIGMA_FILES_CHANGED=$(git diff --shortstat figma | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: | From 523d0861872051cc57c5bde759cfc1a026d61ab2 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 20:53:26 -0600 Subject: [PATCH 53/73] More testing --- .github/workflows/tokens-build.yml | 5 +++-- packages/tokens/figma/new.json | 0 packages/tokens/figma/new2.json | 0 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 packages/tokens/figma/new.json create mode 100644 packages/tokens/figma/new2.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 52ada893..392fd7ac 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -43,8 +43,9 @@ jobs: run: | echo $FIGMA_FILES_CHANGED git diff --shortstat figma | wc -l - git status figma --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l - echo "FIGMA_FILES_CHANGED=$(git diff --shortstat figma | wc -l)" >> $GITHUB_ENV + git diff HEAD --name-only figma | wc -l + git git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l + echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: | diff --git a/packages/tokens/figma/new.json b/packages/tokens/figma/new.json new file mode 100644 index 00000000..e69de29b diff --git a/packages/tokens/figma/new2.json b/packages/tokens/figma/new2.json new file mode 100644 index 00000000..e69de29b From a88694043abf1d85eea271ed487fc863cca7f3bd Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:13:06 -0600 Subject: [PATCH 54/73] New tact of testing --- .github/workflows/tokens-build.yml | 10 +-- packages/tokens/figma/color.json | 94 ----------------------- packages/tokens/figma/iBeliever copy.json | 0 packages/tokens/figma/iBeliever.json | 0 packages/tokens/figma/new.json | 0 packages/tokens/figma/new2.json | 0 packages/tokens/figma/testFile2.json | 0 7 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 packages/tokens/figma/color.json delete mode 100644 packages/tokens/figma/iBeliever copy.json delete mode 100644 packages/tokens/figma/iBeliever.json delete mode 100644 packages/tokens/figma/new.json delete mode 100644 packages/tokens/figma/new2.json delete mode 100644 packages/tokens/figma/testFile2.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 392fd7ac..24bd534e 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -29,8 +29,7 @@ jobs: cache: yarn cache-dependency-path: yarn.lock - run: yarn install - - name: Build tokens - run: yarn tokens:build + - run: yarn tokens:build - name: Prepare commit working-directory: packages/tokens run: | @@ -41,21 +40,16 @@ jobs: - name: Check for `figma` diff working-directory: packages/tokens run: | - echo $FIGMA_FILES_CHANGED git diff --shortstat figma | wc -l git diff HEAD --name-only figma | wc -l git git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} - run: | - echo $FIGMA_FILES_CHANGED - echo No changes to figma tokens + run: echo No changes to figma tokens - name: Commit latest `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED >= 1 }} working-directory: packages/tokens run: | - echo $FIGMA_FILES_CHANGED - exit 1 git commit -m 'Build latest figma tokens' git push diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} diff --git a/packages/tokens/figma/iBeliever copy.json b/packages/tokens/figma/iBeliever copy.json deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/tokens/figma/iBeliever.json b/packages/tokens/figma/iBeliever.json deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/tokens/figma/new.json b/packages/tokens/figma/new.json deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/tokens/figma/new2.json b/packages/tokens/figma/new2.json deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/tokens/figma/testFile2.json b/packages/tokens/figma/testFile2.json deleted file mode 100644 index e69de29b..00000000 From 5f179aa1047a0b7c29e3753fb3e03728cebfb446 Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 03:14:20 +0000 Subject: [PATCH 55/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From 6117f8427c77ccf41e6c9aa92170bfb1137432dd Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:17:01 -0600 Subject: [PATCH 56/73] Fix typo, re-remove colors --- .github/workflows/tokens-build.yml | 2 +- packages/tokens/figma/color.json | 94 ------------------------------ 2 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 packages/tokens/figma/color.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 24bd534e..83507aea 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -42,7 +42,7 @@ jobs: run: | git diff --shortstat figma | wc -l git diff HEAD --name-only figma | wc -l - git git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l + git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From 404dd3f604488121a6306aa5bdc74dcc9c62e285 Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 03:18:12 +0000 Subject: [PATCH 57/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From b4222613321e644ab1ddda9362fcb2c1f3ee46e0 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:22:47 -0600 Subject: [PATCH 58/73] fancier test --- .github/workflows/tokens-build.yml | 1 - packages/tokens/src/tokens/tester/base.json | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/tokens/src/tokens/tester/base.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 83507aea..9da05cda 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -40,7 +40,6 @@ jobs: - name: Check for `figma` diff working-directory: packages/tokens run: | - git diff --shortstat figma | wc -l git diff HEAD --name-only figma | wc -l git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV diff --git a/packages/tokens/src/tokens/tester/base.json b/packages/tokens/src/tokens/tester/base.json new file mode 100644 index 00000000..2fb138c0 --- /dev/null +++ b/packages/tokens/src/tokens/tester/base.json @@ -0,0 +1,6 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + } +} From d8e086f6a72efb56d85e2c0676fd1c6b9011910f Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:26:55 -0600 Subject: [PATCH 59/73] Another test token set --- .../src/tokens/anotherTestTokenSet/base.json | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 packages/tokens/src/tokens/anotherTestTokenSet/base.json diff --git a/packages/tokens/src/tokens/anotherTestTokenSet/base.json b/packages/tokens/src/tokens/anotherTestTokenSet/base.json new file mode 100644 index 00000000..e9137444 --- /dev/null +++ b/packages/tokens/src/tokens/anotherTestTokenSet/base.json @@ -0,0 +1,81 @@ +{ + "color": { + "primary": { + "darker": { + "value": "#003e73" + }, + "alt": { + "lightest": { + "value": "#e1f3f8" + } + } + }, + "secondary": { + "lightest": { + "value": "#f9dede" + } + }, + "white": { + "value": "#ffffff" + }, + "black": { + "value": "#000000" + }, + "gray": { + "*": { + "value": "#5b616b" + }, + "dark": { + "value": "#323a45" + }, + "medium": { + "value": "#757575" + }, + "light": { + "value": "#aeb0b5" + }, + "light-alt": { + "value": "#eeeeee" + }, + "lighter": { + "value": "#d6d7d9" + }, + "lightest": { + "value": "#f1f1f1" + }, + "warm-dark": { + "value": "#494440" + }, + "warm-light": { + "value": "#e4e2e0" + }, + "cool-light": { + "value": "#dce4ef" + } + }, + "uswds-system-color-blue-vivid-30": { + "value": "#58b4ff" + }, + "uswds-system-color-blue-vivid-60": { + "value": "#005ea2" + }, + "uswds-system-color-blue-warm-vivid-80": { + "value": "#162e51" + }, + "uswds-system-color-gray-30": { + "value": "#adadad" + }, + "uswds-system-color-gray-80": { + "value": "#2e2e2e" + }, + "uswds-system-color-red-vivid-40": { + "value": "#fb5a47" + }, + "uswds-system-color-red-vivid-60": { + "value": "#b50909" + }, + "uswds-system-color-red-vivid-80": { + "value": "#5c1111" + } + } +} From 41232d7e9a604039a386426253c42356af40e77d Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 03:29:18 +0000 Subject: [PATCH 60/73] Build latest figma tokens --- .../tokens/figma/anotherTestTokenSet.json | 94 +++++++++++++++++++ packages/tokens/figma/tester.json | 94 +++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 packages/tokens/figma/anotherTestTokenSet.json create mode 100644 packages/tokens/figma/tester.json diff --git a/packages/tokens/figma/anotherTestTokenSet.json b/packages/tokens/figma/anotherTestTokenSet.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/anotherTestTokenSet.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} diff --git a/packages/tokens/figma/tester.json b/packages/tokens/figma/tester.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/tester.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From fec503b45ddae0d9f25c51eada7a88a6f31e8de4 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:32:10 -0600 Subject: [PATCH 61/73] Removing test token sets --- .../src/tokens/anotherTestTokenSet/base.json | 81 ------------------- packages/tokens/src/tokens/tester/base.json | 6 -- 2 files changed, 87 deletions(-) delete mode 100644 packages/tokens/src/tokens/anotherTestTokenSet/base.json delete mode 100644 packages/tokens/src/tokens/tester/base.json diff --git a/packages/tokens/src/tokens/anotherTestTokenSet/base.json b/packages/tokens/src/tokens/anotherTestTokenSet/base.json deleted file mode 100644 index e9137444..00000000 --- a/packages/tokens/src/tokens/anotherTestTokenSet/base.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "color": { - "primary": { - "darker": { - "value": "#003e73" - }, - "alt": { - "lightest": { - "value": "#e1f3f8" - } - } - }, - "secondary": { - "lightest": { - "value": "#f9dede" - } - }, - "white": { - "value": "#ffffff" - }, - "black": { - "value": "#000000" - }, - "gray": { - "*": { - "value": "#5b616b" - }, - "dark": { - "value": "#323a45" - }, - "medium": { - "value": "#757575" - }, - "light": { - "value": "#aeb0b5" - }, - "light-alt": { - "value": "#eeeeee" - }, - "lighter": { - "value": "#d6d7d9" - }, - "lightest": { - "value": "#f1f1f1" - }, - "warm-dark": { - "value": "#494440" - }, - "warm-light": { - "value": "#e4e2e0" - }, - "cool-light": { - "value": "#dce4ef" - } - }, - "uswds-system-color-blue-vivid-30": { - "value": "#58b4ff" - }, - "uswds-system-color-blue-vivid-60": { - "value": "#005ea2" - }, - "uswds-system-color-blue-warm-vivid-80": { - "value": "#162e51" - }, - "uswds-system-color-gray-30": { - "value": "#adadad" - }, - "uswds-system-color-gray-80": { - "value": "#2e2e2e" - }, - "uswds-system-color-red-vivid-40": { - "value": "#fb5a47" - }, - "uswds-system-color-red-vivid-60": { - "value": "#b50909" - }, - "uswds-system-color-red-vivid-80": { - "value": "#5c1111" - } - } -} diff --git a/packages/tokens/src/tokens/tester/base.json b/packages/tokens/src/tokens/tester/base.json deleted file mode 100644 index 2fb138c0..00000000 --- a/packages/tokens/src/tokens/tester/base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - } -} From 5c8c274d8cf38d3fbf9c1b6fcdd55a8bc9e75213 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:39:27 -0600 Subject: [PATCH 62/73] Clean up --- .github/workflows/tokens-build.yml | 5 +- .../tokens/figma/anotherTestTokenSet.json | 94 ------------------- packages/tokens/figma/color.json | 94 ------------------- packages/tokens/figma/tester.json | 94 ------------------- 4 files changed, 1 insertion(+), 286 deletions(-) delete mode 100644 packages/tokens/figma/anotherTestTokenSet.json delete mode 100644 packages/tokens/figma/color.json delete mode 100644 packages/tokens/figma/tester.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 9da05cda..2bf14fa7 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -39,10 +39,7 @@ jobs: git add -f figma/ - name: Check for `figma` diff working-directory: packages/tokens - run: | - git diff HEAD --name-only figma | wc -l - git status figma -uall --porcelain 2>/dev/null| egrep "^(A| A|M| M|R| R|D| D)" | wc -l - echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV + run: echo "FIGMA_FILES_CHANGED=$(git diff HEAD --name-only figma | wc -l)" >> $GITHUB_ENV - name: No changes to `figma` tokens if: ${{ env.FIGMA_FILES_CHANGED == 0 }} run: echo No changes to figma tokens diff --git a/packages/tokens/figma/anotherTestTokenSet.json b/packages/tokens/figma/anotherTestTokenSet.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/anotherTestTokenSet.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} diff --git a/packages/tokens/figma/tester.json b/packages/tokens/figma/tester.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/tester.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From 3d9e052df19abedecad4defcacc330a43d0c7f25 Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 03:42:13 +0000 Subject: [PATCH 63/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From 76070525e236c5c28af92c9a972900cc0bc0871d Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:49:54 -0600 Subject: [PATCH 64/73] Modifying tokens test --- packages/tokens/src/tokens/color/base.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/tokens/src/tokens/color/base.json b/packages/tokens/src/tokens/color/base.json index e9137444..6a828ac7 100644 --- a/packages/tokens/src/tokens/color/base.json +++ b/packages/tokens/src/tokens/color/base.json @@ -10,14 +10,6 @@ } } }, - "secondary": { - "lightest": { - "value": "#f9dede" - } - }, - "white": { - "value": "#ffffff" - }, "black": { "value": "#000000" }, From 23f35d711fcf77a05cb9bb7ea7d7d2e35161000c Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 03:51:11 +0000 Subject: [PATCH 65/73] Build latest figma tokens --- packages/tokens/figma/color.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json index ae902c2f..7fa7adc8 100644 --- a/packages/tokens/figma/color.json +++ b/packages/tokens/figma/color.json @@ -7,14 +7,6 @@ "$value": "#e1f3f8", "$type": "color" }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, "black": { "$value": "#000000", "$type": "color" From 0bc2c62eb882ab473ccb321c315beedaa289af6e Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 21:59:43 -0600 Subject: [PATCH 66/73] Restore tokens --- packages/tokens/src/tokens/color/base.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/tokens/src/tokens/color/base.json b/packages/tokens/src/tokens/color/base.json index 6a828ac7..e9137444 100644 --- a/packages/tokens/src/tokens/color/base.json +++ b/packages/tokens/src/tokens/color/base.json @@ -10,6 +10,14 @@ } } }, + "secondary": { + "lightest": { + "value": "#f9dede" + } + }, + "white": { + "value": "#ffffff" + }, "black": { "value": "#000000" }, From f607bf4d144cbcef9aa1005fff6fac51bfb91da0 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 22:05:47 -0600 Subject: [PATCH 67/73] Re-remove figma to be ready for PR --- packages/tokens/figma/color.json | 86 -------------------------------- 1 file changed, 86 deletions(-) delete mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index 7fa7adc8..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From 2e4f2b2428d14814529c441d0edcb7085134659c Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 22:22:27 -0600 Subject: [PATCH 68/73] New and improved + 2 test token sets --- .github/workflows/tokens-build.yml | 3 + packages/tokens/src/tokens/test1/base.json | 81 ++++++++++++++++++++++ packages/tokens/src/tokens/test2/base.json | 81 ++++++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 packages/tokens/src/tokens/test1/base.json create mode 100644 packages/tokens/src/tokens/test2/base.json diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 2bf14fa7..8629cfe8 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -29,6 +29,9 @@ jobs: cache: yarn cache-dependency-path: yarn.lock - run: yarn install + - name: Clean `figma` folder + working-directory: packages/tokens + run: rm -r figma - run: yarn tokens:build - name: Prepare commit working-directory: packages/tokens diff --git a/packages/tokens/src/tokens/test1/base.json b/packages/tokens/src/tokens/test1/base.json new file mode 100644 index 00000000..e9137444 --- /dev/null +++ b/packages/tokens/src/tokens/test1/base.json @@ -0,0 +1,81 @@ +{ + "color": { + "primary": { + "darker": { + "value": "#003e73" + }, + "alt": { + "lightest": { + "value": "#e1f3f8" + } + } + }, + "secondary": { + "lightest": { + "value": "#f9dede" + } + }, + "white": { + "value": "#ffffff" + }, + "black": { + "value": "#000000" + }, + "gray": { + "*": { + "value": "#5b616b" + }, + "dark": { + "value": "#323a45" + }, + "medium": { + "value": "#757575" + }, + "light": { + "value": "#aeb0b5" + }, + "light-alt": { + "value": "#eeeeee" + }, + "lighter": { + "value": "#d6d7d9" + }, + "lightest": { + "value": "#f1f1f1" + }, + "warm-dark": { + "value": "#494440" + }, + "warm-light": { + "value": "#e4e2e0" + }, + "cool-light": { + "value": "#dce4ef" + } + }, + "uswds-system-color-blue-vivid-30": { + "value": "#58b4ff" + }, + "uswds-system-color-blue-vivid-60": { + "value": "#005ea2" + }, + "uswds-system-color-blue-warm-vivid-80": { + "value": "#162e51" + }, + "uswds-system-color-gray-30": { + "value": "#adadad" + }, + "uswds-system-color-gray-80": { + "value": "#2e2e2e" + }, + "uswds-system-color-red-vivid-40": { + "value": "#fb5a47" + }, + "uswds-system-color-red-vivid-60": { + "value": "#b50909" + }, + "uswds-system-color-red-vivid-80": { + "value": "#5c1111" + } + } +} diff --git a/packages/tokens/src/tokens/test2/base.json b/packages/tokens/src/tokens/test2/base.json new file mode 100644 index 00000000..e9137444 --- /dev/null +++ b/packages/tokens/src/tokens/test2/base.json @@ -0,0 +1,81 @@ +{ + "color": { + "primary": { + "darker": { + "value": "#003e73" + }, + "alt": { + "lightest": { + "value": "#e1f3f8" + } + } + }, + "secondary": { + "lightest": { + "value": "#f9dede" + } + }, + "white": { + "value": "#ffffff" + }, + "black": { + "value": "#000000" + }, + "gray": { + "*": { + "value": "#5b616b" + }, + "dark": { + "value": "#323a45" + }, + "medium": { + "value": "#757575" + }, + "light": { + "value": "#aeb0b5" + }, + "light-alt": { + "value": "#eeeeee" + }, + "lighter": { + "value": "#d6d7d9" + }, + "lightest": { + "value": "#f1f1f1" + }, + "warm-dark": { + "value": "#494440" + }, + "warm-light": { + "value": "#e4e2e0" + }, + "cool-light": { + "value": "#dce4ef" + } + }, + "uswds-system-color-blue-vivid-30": { + "value": "#58b4ff" + }, + "uswds-system-color-blue-vivid-60": { + "value": "#005ea2" + }, + "uswds-system-color-blue-warm-vivid-80": { + "value": "#162e51" + }, + "uswds-system-color-gray-30": { + "value": "#adadad" + }, + "uswds-system-color-gray-80": { + "value": "#2e2e2e" + }, + "uswds-system-color-red-vivid-40": { + "value": "#fb5a47" + }, + "uswds-system-color-red-vivid-60": { + "value": "#b50909" + }, + "uswds-system-color-red-vivid-80": { + "value": "#5c1111" + } + } +} From 128b0620994bbed787979c6facff59cfc808c5f4 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 22:25:47 -0600 Subject: [PATCH 69/73] Need mo powa --- .github/workflows/tokens-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tokens-build.yml b/.github/workflows/tokens-build.yml index 8629cfe8..05415c8a 100644 --- a/.github/workflows/tokens-build.yml +++ b/.github/workflows/tokens-build.yml @@ -31,7 +31,7 @@ jobs: - run: yarn install - name: Clean `figma` folder working-directory: packages/tokens - run: rm -r figma + run: rm -rf figma - run: yarn tokens:build - name: Prepare commit working-directory: packages/tokens From 73e4b9c67861c7dd4bdcef29e47503a9728e994f Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Sat, 16 Dec 2023 04:26:52 +0000 Subject: [PATCH 70/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ packages/tokens/figma/test1.json | 94 ++++++++++++++++++++++++++++++++ packages/tokens/figma/test2.json | 94 ++++++++++++++++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 packages/tokens/figma/color.json create mode 100644 packages/tokens/figma/test1.json create mode 100644 packages/tokens/figma/test2.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} diff --git a/packages/tokens/figma/test1.json b/packages/tokens/figma/test1.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/test1.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} diff --git a/packages/tokens/figma/test2.json b/packages/tokens/figma/test2.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/test2.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +} From 711b5b59b8973120917d03210d29aea6b886adf6 Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 22:29:13 -0600 Subject: [PATCH 71/73] Remove tests --- packages/tokens/src/tokens/test1/base.json | 81 ---------------------- packages/tokens/src/tokens/test2/base.json | 81 ---------------------- 2 files changed, 162 deletions(-) delete mode 100644 packages/tokens/src/tokens/test1/base.json delete mode 100644 packages/tokens/src/tokens/test2/base.json diff --git a/packages/tokens/src/tokens/test1/base.json b/packages/tokens/src/tokens/test1/base.json deleted file mode 100644 index e9137444..00000000 --- a/packages/tokens/src/tokens/test1/base.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "color": { - "primary": { - "darker": { - "value": "#003e73" - }, - "alt": { - "lightest": { - "value": "#e1f3f8" - } - } - }, - "secondary": { - "lightest": { - "value": "#f9dede" - } - }, - "white": { - "value": "#ffffff" - }, - "black": { - "value": "#000000" - }, - "gray": { - "*": { - "value": "#5b616b" - }, - "dark": { - "value": "#323a45" - }, - "medium": { - "value": "#757575" - }, - "light": { - "value": "#aeb0b5" - }, - "light-alt": { - "value": "#eeeeee" - }, - "lighter": { - "value": "#d6d7d9" - }, - "lightest": { - "value": "#f1f1f1" - }, - "warm-dark": { - "value": "#494440" - }, - "warm-light": { - "value": "#e4e2e0" - }, - "cool-light": { - "value": "#dce4ef" - } - }, - "uswds-system-color-blue-vivid-30": { - "value": "#58b4ff" - }, - "uswds-system-color-blue-vivid-60": { - "value": "#005ea2" - }, - "uswds-system-color-blue-warm-vivid-80": { - "value": "#162e51" - }, - "uswds-system-color-gray-30": { - "value": "#adadad" - }, - "uswds-system-color-gray-80": { - "value": "#2e2e2e" - }, - "uswds-system-color-red-vivid-40": { - "value": "#fb5a47" - }, - "uswds-system-color-red-vivid-60": { - "value": "#b50909" - }, - "uswds-system-color-red-vivid-80": { - "value": "#5c1111" - } - } -} diff --git a/packages/tokens/src/tokens/test2/base.json b/packages/tokens/src/tokens/test2/base.json deleted file mode 100644 index e9137444..00000000 --- a/packages/tokens/src/tokens/test2/base.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "color": { - "primary": { - "darker": { - "value": "#003e73" - }, - "alt": { - "lightest": { - "value": "#e1f3f8" - } - } - }, - "secondary": { - "lightest": { - "value": "#f9dede" - } - }, - "white": { - "value": "#ffffff" - }, - "black": { - "value": "#000000" - }, - "gray": { - "*": { - "value": "#5b616b" - }, - "dark": { - "value": "#323a45" - }, - "medium": { - "value": "#757575" - }, - "light": { - "value": "#aeb0b5" - }, - "light-alt": { - "value": "#eeeeee" - }, - "lighter": { - "value": "#d6d7d9" - }, - "lightest": { - "value": "#f1f1f1" - }, - "warm-dark": { - "value": "#494440" - }, - "warm-light": { - "value": "#e4e2e0" - }, - "cool-light": { - "value": "#dce4ef" - } - }, - "uswds-system-color-blue-vivid-30": { - "value": "#58b4ff" - }, - "uswds-system-color-blue-vivid-60": { - "value": "#005ea2" - }, - "uswds-system-color-blue-warm-vivid-80": { - "value": "#162e51" - }, - "uswds-system-color-gray-30": { - "value": "#adadad" - }, - "uswds-system-color-gray-80": { - "value": "#2e2e2e" - }, - "uswds-system-color-red-vivid-40": { - "value": "#fb5a47" - }, - "uswds-system-color-red-vivid-60": { - "value": "#b50909" - }, - "uswds-system-color-red-vivid-80": { - "value": "#5c1111" - } - } -} From d5a08e71c316d6a33468fc99194bbf74af87077a Mon Sep 17 00:00:00 2001 From: Tim R Date: Fri, 15 Dec 2023 22:31:53 -0600 Subject: [PATCH 72/73] Clean up for PR/main merge --- packages/tokens/figma/color.json | 94 -------------------------------- packages/tokens/figma/test1.json | 94 -------------------------------- packages/tokens/figma/test2.json | 94 -------------------------------- 3 files changed, 282 deletions(-) delete mode 100644 packages/tokens/figma/color.json delete mode 100644 packages/tokens/figma/test1.json delete mode 100644 packages/tokens/figma/test2.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/color.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} diff --git a/packages/tokens/figma/test1.json b/packages/tokens/figma/test1.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/test1.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} diff --git a/packages/tokens/figma/test2.json b/packages/tokens/figma/test2.json deleted file mode 100644 index ae902c2f..00000000 --- a/packages/tokens/figma/test2.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "primaryDarker": { - "$value": "#003e73", - "$type": "color" - }, - "primaryAltLightest": { - "$value": "#e1f3f8", - "$type": "color" - }, - "secondaryLightest": { - "$value": "#f9dede", - "$type": "color" - }, - "white": { - "$value": "#ffffff", - "$type": "color" - }, - "black": { - "$value": "#000000", - "$type": "color" - }, - "gray": { - "$value": "#5b616b", - "$type": "color" - }, - "grayDark": { - "$value": "#323a45", - "$type": "color" - }, - "grayMedium": { - "$value": "#757575", - "$type": "color" - }, - "grayLight": { - "$value": "#aeb0b5", - "$type": "color" - }, - "grayLightAlt": { - "$value": "#eeeeee", - "$type": "color" - }, - "grayLighter": { - "$value": "#d6d7d9", - "$type": "color" - }, - "grayLightest": { - "$value": "#f1f1f1", - "$type": "color" - }, - "grayWarmDark": { - "$value": "#494440", - "$type": "color" - }, - "grayWarmLight": { - "$value": "#e4e2e0", - "$type": "color" - }, - "grayCoolLight": { - "$value": "#dce4ef", - "$type": "color" - }, - "uswdsSystemColorBlueVivid30": { - "$value": "#58b4ff", - "$type": "color" - }, - "uswdsSystemColorBlueVivid60": { - "$value": "#005ea2", - "$type": "color" - }, - "uswdsSystemColorBlueWarmVivid80": { - "$value": "#162e51", - "$type": "color" - }, - "uswdsSystemColorGray30": { - "$value": "#adadad", - "$type": "color" - }, - "uswdsSystemColorGray80": { - "$value": "#2e2e2e", - "$type": "color" - }, - "uswdsSystemColorRedVivid40": { - "$value": "#fb5a47", - "$type": "color" - }, - "uswdsSystemColorRedVivid60": { - "$value": "#b50909", - "$type": "color" - }, - "uswdsSystemColorRedVivid80": { - "$value": "#5c1111", - "$type": "color" - } -} From b65639c23bf9bf7389d0d89bbeec3f4f7f1cc767 Mon Sep 17 00:00:00 2001 From: VA Automation Bot Date: Tue, 19 Dec 2023 16:51:45 +0000 Subject: [PATCH 73/73] Build latest figma tokens --- packages/tokens/figma/color.json | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/tokens/figma/color.json diff --git a/packages/tokens/figma/color.json b/packages/tokens/figma/color.json new file mode 100644 index 00000000..ae902c2f --- /dev/null +++ b/packages/tokens/figma/color.json @@ -0,0 +1,94 @@ +{ + "primaryDarker": { + "$value": "#003e73", + "$type": "color" + }, + "primaryAltLightest": { + "$value": "#e1f3f8", + "$type": "color" + }, + "secondaryLightest": { + "$value": "#f9dede", + "$type": "color" + }, + "white": { + "$value": "#ffffff", + "$type": "color" + }, + "black": { + "$value": "#000000", + "$type": "color" + }, + "gray": { + "$value": "#5b616b", + "$type": "color" + }, + "grayDark": { + "$value": "#323a45", + "$type": "color" + }, + "grayMedium": { + "$value": "#757575", + "$type": "color" + }, + "grayLight": { + "$value": "#aeb0b5", + "$type": "color" + }, + "grayLightAlt": { + "$value": "#eeeeee", + "$type": "color" + }, + "grayLighter": { + "$value": "#d6d7d9", + "$type": "color" + }, + "grayLightest": { + "$value": "#f1f1f1", + "$type": "color" + }, + "grayWarmDark": { + "$value": "#494440", + "$type": "color" + }, + "grayWarmLight": { + "$value": "#e4e2e0", + "$type": "color" + }, + "grayCoolLight": { + "$value": "#dce4ef", + "$type": "color" + }, + "uswdsSystemColorBlueVivid30": { + "$value": "#58b4ff", + "$type": "color" + }, + "uswdsSystemColorBlueVivid60": { + "$value": "#005ea2", + "$type": "color" + }, + "uswdsSystemColorBlueWarmVivid80": { + "$value": "#162e51", + "$type": "color" + }, + "uswdsSystemColorGray30": { + "$value": "#adadad", + "$type": "color" + }, + "uswdsSystemColorGray80": { + "$value": "#2e2e2e", + "$type": "color" + }, + "uswdsSystemColorRedVivid40": { + "$value": "#fb5a47", + "$type": "color" + }, + "uswdsSystemColorRedVivid60": { + "$value": "#b50909", + "$type": "color" + }, + "uswdsSystemColorRedVivid80": { + "$value": "#5c1111", + "$type": "color" + } +}