Skip to content

Commit 9dfd73c

Browse files
authored
Removing configlet lint from critical CI path. (#439)
* Removing configlet lint from critical CI path. * Fixing CMakeLists for new directory structure. * Fixing Windows CI broken path. * Copy tags from exercism/c. * Add missing fields to concept config.json.
1 parent 4cb8413 commit 9dfd73c

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,12 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
12-
configuration-test:
13-
name: Check Configuration
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@v2.3.4
17-
- name: Configlet
18-
run: |
19-
bin/fetch-configlet
20-
bin/configlet lint .
21-
bin/check-configlet-fmt.sh
22-
env:
23-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
2512
linux-min:
2613
name: Linux Min Config
2714
runs-on: ubuntu-16.04
@@ -44,7 +31,7 @@ jobs:
4431

4532
linux-latest:
4633
name: Linux Latest Config
47-
needs: [linux-min, configuration-test]
34+
needs: [linux-min]
4835
runs-on: ubuntu-latest
4936
strategy:
5037
matrix:
@@ -74,23 +61,23 @@ jobs:
7461

7562
windows:
7663
name: Windows
77-
needs: [linux-min, configuration-test]
64+
needs: [linux-min]
7865
runs-on: windows-latest
7966
steps:
8067
- uses: actions/checkout@v2.3.4
8168
- name: Run Tests
8269
shell: powershell
8370
# Delete the exercises that require Boost to avoid issues with Windows setup.
8471
run: |
85-
rm exercises/gigasecond -r
86-
rm exercises/meetup -r
72+
rm exercises/practice/gigasecond -r
73+
rm exercises/practice/meetup -r
8774
cmake .
8875
cmake --build . -- test_hello-world
8976
cmake --build .
9077
9178
mac:
9279
name: MacOS
93-
needs: [linux-min, configuration-test]
80+
needs: [linux-min]
9481
runs-on: macOS-latest
9582
steps:
9683
- uses: actions/checkout@v2.3.4

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.5.1)
22
project(exercism CXX)
33

4-
set(alt_exercise_tree ${CMAKE_CURRENT_SOURCE_DIR}/build_exercises)
4+
set(alt_exercise_tree ${CMAKE_CURRENT_SOURCE_DIR}/build_exercises/practice)
55

66
function(build_fixup exercise_dir alt_exercise_root)
77
string(REPLACE "-" "_" file ${exercise_dir})
8-
set(source ${CMAKE_CURRENT_SOURCE_DIR}/exercises/${exercise_dir})
8+
set(source ${CMAKE_CURRENT_SOURCE_DIR}/exercises/practice/${exercise_dir})
99
if(EXISTS ${source})
1010
set(alt_exercise_dir ${alt_exercise_root}/${exercise_dir})
1111
file(COPY ${source} DESTINATION ${alt_exercise_root})
@@ -30,7 +30,7 @@ if(EXERCISM_COMMON_CATCH)
3030
)
3131
endif()
3232

33-
file(GLOB exercise_list ${CMAKE_CURRENT_SOURCE_DIR}/exercises/*)
33+
file(GLOB exercise_list ${CMAKE_CURRENT_SOURCE_DIR}/exercises/practice/*)
3434

3535
foreach(exercise_dir ${exercise_list})
3636
get_filename_component(exercise ${exercise_dir} NAME)

config.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,5 +736,25 @@
736736
}
737737
],
738738
"key_features": [],
739-
"tags": []
739+
"tags": [
740+
"execution_mode/compiled",
741+
"paradigm/procedural",
742+
"typing/static",
743+
"platform/android",
744+
"platform/ios",
745+
"platform/linux",
746+
"platform/mac",
747+
"platform/windows",
748+
"runtime/language_specific",
749+
"used_for/backends",
750+
"used_for/cross_platform_development",
751+
"used_for/embedded_systems",
752+
"used_for/financial_systems",
753+
"used_for/frontends",
754+
"used_for/games",
755+
"used_for/guis",
756+
"used_for/mobile",
757+
"used_for/robotics",
758+
"used_for/scientific_calculations"
759+
]
740760
}

0 commit comments

Comments
 (0)