From 7fee098aa2e8bfa3f9fb0f609063f963c1bdb110 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 8 Mar 2021 11:05:52 -0800
Subject: [PATCH 1/5] Removing configlet lint from critical CI path.

---
 .github/workflows/ci.yml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65e4f0bc..a5313bf3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,25 +3,12 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
-  configuration-test:
-    name: Check Configuration
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Configlet
-      run: |
-        bin/fetch-configlet
-        bin/configlet lint .
-        bin/check-configlet-fmt.sh
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   linux-min:
     name: Linux Min Config
     runs-on: ubuntu-16.04
@@ -44,7 +31,7 @@ jobs:
 
   linux-latest:
     name: Linux Latest Config
-    needs: [linux-min, configuration-test]
+    needs: [linux-min]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -74,7 +61,7 @@ jobs:
 
   windows:
     name: Windows
-    needs: [linux-min, configuration-test]
+    needs: [linux-min]
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1
@@ -90,7 +77,7 @@ jobs:
 
   mac:
     name: MacOS
-    needs: [linux-min, configuration-test]
+    needs: [linux-min]
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v1

From 265d3652e8c698bc6dc16bf58d583c7306fa6d90 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 8 Mar 2021 11:20:32 -0800
Subject: [PATCH 2/5] Fixing CMakeLists for new directory structure.

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 752e331b..e12464f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.5.1)
 project(exercism CXX)
 
-set(alt_exercise_tree ${CMAKE_CURRENT_SOURCE_DIR}/build_exercises)
+set(alt_exercise_tree ${CMAKE_CURRENT_SOURCE_DIR}/build_exercises/practice)
 
 function(build_fixup exercise_dir alt_exercise_root)
     string(REPLACE "-" "_" file ${exercise_dir})
-    set(source ${CMAKE_CURRENT_SOURCE_DIR}/exercises/${exercise_dir})
+    set(source ${CMAKE_CURRENT_SOURCE_DIR}/exercises/practice/${exercise_dir})
     if(EXISTS ${source})
         set(alt_exercise_dir ${alt_exercise_root}/${exercise_dir})
         file(COPY ${source} DESTINATION ${alt_exercise_root})
@@ -30,7 +30,7 @@ if(EXERCISM_COMMON_CATCH)
     )
 endif()
 
-file(GLOB exercise_list ${CMAKE_CURRENT_SOURCE_DIR}/exercises/*)
+file(GLOB exercise_list ${CMAKE_CURRENT_SOURCE_DIR}/exercises/practice/*)
 
 foreach(exercise_dir ${exercise_list})
     get_filename_component(exercise ${exercise_dir} NAME)

From f86918864993ddb29c067f105b1b911764154222 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 8 Mar 2021 11:37:22 -0800
Subject: [PATCH 3/5] Fixing Windows CI broken path.

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5313bf3..c953d6d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,8 +69,8 @@ jobs:
       shell: powershell
       # Delete the exercises that require Boost to avoid issues with Windows setup.
       run: |
-        rm exercises/gigasecond -r
-        rm exercises/meetup -r
+        rm exercises/practice/gigasecond -r
+        rm exercises/practice/meetup -r
         cmake .
         cmake --build . -- test_hello-world
         cmake --build .

From 998199be3df48368b7a4eb3b607f20a5842ffc6c Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 8 Mar 2021 11:45:10 -0800
Subject: [PATCH 4/5] Copy tags from exercism/c.

---
 config.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/config.json b/config.json
index da23f471..15095812 100644
--- a/config.json
+++ b/config.json
@@ -717,5 +717,25 @@
     }
   ],
   "key_features": [],
-  "tags": []
+  "tags": [
+    "execution_mode/compiled",
+    "paradigm/procedural",
+    "typing/static",
+    "platform/android",
+    "platform/ios",
+    "platform/linux",
+    "platform/mac",
+    "platform/windows",
+    "runtime/language_specific",
+    "used_for/backends",
+    "used_for/cross_platform_development",
+    "used_for/embedded_systems",
+    "used_for/financial_systems",
+    "used_for/frontends",
+    "used_for/games",
+    "used_for/guis",
+    "used_for/mobile",
+    "used_for/robotics",
+    "used_for/scientific_calculations"
+  ]
 }

From 5a695e2fd8549aadb8a249ebd76e9fb0ea0ad16e Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 8 Mar 2021 11:53:14 -0800
Subject: [PATCH 5/5] Add missing fields to concept config.json.

---
 exercises/concept/strings/.meta/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exercises/concept/strings/.meta/config.json b/exercises/concept/strings/.meta/config.json
index c5798ea4..8b5292f5 100644
--- a/exercises/concept/strings/.meta/config.json
+++ b/exercises/concept/strings/.meta/config.json
@@ -7,8 +7,8 @@
   ],
   "forked_from": ["csharp/strings"],
   "files": {
-    "solution": [],
-    "test": [],
+    "solution": ["strings.cpp", "strings.h"],
+    "test": ["strings_test.cpp"],
     "exemplar": [".meta/exemplar.cpp", ".meta/exemplar.h"]
   }
 }