Resolve merge conflicts

hashicorp · Jul 22, 2021 · a004de7 · a004de7
1 parent 2fce112
commit a004de7
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 60 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
@@ -241,10 +241,10 @@ jobs:
           key: package-6a272394a37f56f2552603381358e76fbf526b3f-{{checksum ".buildcache/cache-keys/package-6a272394a37f56f2552603381358e76fbf526b3f"}}
           name: Restore package cache
       - restore_cache:
-          key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
+          key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}}
           name: Restore package cache
       - restore_cache:
-          key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}}
+          key: package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7-{{checksum ".buildcache/cache-keys/package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7"}}
           name: Restore package cache
       - restore_cache:
           key: package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc-{{checksum ".buildcache/cache-keys/package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc"}}
@@ -295,20 +295,20 @@ jobs:
           command: ls -lahR .buildcache
           name: List Build Cache
       - run:
-          command: cp packages*.lock/pkgs.yml lockfile-e0096d0cd2ca1c5a.yml
+          command: cp packages*.lock/pkgs.yml lockfile-423447b8bd37d1c3.yml
           name: Update Lockfile Name
       - run:
-          command: tar -czf packages-e0096d0cd2ca1c5a.tar.gz .buildcache/packages lockfile-e0096d0cd2ca1c5a.yml
+          command: tar -czf packages-423447b8bd37d1c3.tar.gz .buildcache/packages lockfile-423447b8bd37d1c3.yml
           name: Create Raw Package Tarball
       - run:
-          command: tar -czf meta-e0096d0cd2ca1c5a.tar.gz .buildcache/packages/store/*.json lockfile-e0096d0cd2ca1c5a.yml
+          command: tar -czf meta-423447b8bd37d1c3.tar.gz .buildcache/packages/store/*.json lockfile-423447b8bd37d1c3.yml
           name: Create Metadata Tarball
       - store_artifacts:
-          path: lockfile-e0096d0cd2ca1c5a.yml
+          path: lockfile-423447b8bd37d1c3.yml
       - store_artifacts:
-          path: packages-e0096d0cd2ca1c5a.tar.gz
+          path: packages-423447b8bd37d1c3.tar.gz
       - store_artifacts:
-          path: meta-e0096d0cd2ca1c5a.tar.gz
+          path: meta-423447b8bd37d1c3.tar.gz
       - store_artifacts:
           path: .buildcache/packages
   darwin_amd64_package:
@@ -383,7 +383,7 @@ jobs:
           key: package-6a272394a37f56f2552603381358e76fbf526b3f-{{checksum ".buildcache/cache-keys/package-6a272394a37f56f2552603381358e76fbf526b3f"}}
           name: Save package cache
     environment:
-      PACKAGE_SPEC_ID: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3
+      PACKAGE_SPEC_ID: 6a272394a37f56f2552603381358e76fbf526b3f
   darwin_arm64_package:
     executor: builder
     steps:
@@ -399,7 +399,7 @@ jobs:
           command: make -C packages*.lock write-package-cache-key
           name: Write package cache key
       - restore_cache:
-          key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
+          key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}}
           name: Restore package cache
       - run:
           command: |2
@@ -415,13 +415,13 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}}
+          key: copy-source_7e82_{{checksum ".buildcache/cache-keys/copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db"}}
           keys:
-            - go-modules_87d5_{{checksum ".buildcache/cache-keys/go-modules-87d5fe370bb634974f7b55a067206409c85d5947"}}
-            - build-static-assets_c9eb_{{checksum ".buildcache/cache-keys/build-static-assets-c9eb755a774c85539457676828158a137604f20d"}}
-            - build-ui_f5d8_{{checksum ".buildcache/cache-keys/build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78"}}
-            - ui-dependencies_ac8b_{{checksum ".buildcache/cache-keys/ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098"}}
-            - install-yarn_3ec0_{{checksum ".buildcache/cache-keys/install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b"}}
+            - go-modules_bb33_{{checksum ".buildcache/cache-keys/go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c"}}
+            - build-static-assets_3aa2_{{checksum ".buildcache/cache-keys/build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488"}}
+            - build-ui_26a9_{{checksum ".buildcache/cache-keys/build-ui-26a986a756dd09ad76b230768f6d889c031d6fea"}}
+            - ui-dependencies_d185_{{checksum ".buildcache/cache-keys/ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71"}}
+            - install-yarn_8d40_{{checksum ".buildcache/cache-keys/install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c"}}
             - set-workdir_3310_{{checksum ".buildcache/cache-keys/set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6"}}
             - install-go-tools_dcaa_{{checksum ".buildcache/cache-keys/install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950"}}
             - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}}
@@ -453,10 +453,10 @@ jobs:
       - save_cache:
           paths:
             - .buildcache/packages/store
-          key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
+          key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}}
           name: Save package cache
     environment:
-      PACKAGE_SPEC_ID: 2ee966c5768e83a92093c0bc6a2fc6042afe4839
+      PACKAGE_SPEC_ID: 579730d9a8f9ff9fa1664cbf08b45f5ed95126ef
   freebsd_386_package:
     executor: builder
     steps:
@@ -1480,7 +1480,7 @@ jobs:
     environment:
       PACKAGE_SPEC_ID: fd42b02886ce62ae770d7c3c08ea50a387593a1f
 workflows:
-  build-e0096d0cd2ca1c5a:
+  build-423447b8bd37d1c3:
     jobs:
       - build-common-layers: {}
       - darwin_amd64_package:

diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml