Skip to content

Commit

Permalink
Removing configlet lint from critical CI path. (#439)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
arcuru authored May 18, 2021
1 parent 4cb8413 commit 9dfd73c
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 24 deletions.
27 changes: 7 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- 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
Expand All @@ -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:
Expand Down Expand Up @@ -74,23 +61,23 @@ jobs:

windows:
name: Windows
needs: [linux-min, configuration-test]
needs: [linux-min]
runs-on: windows-latest
steps:
- uses: actions/[email protected]
- name: Run Tests
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 .
mac:
name: MacOS
needs: [linux-min, configuration-test]
needs: [linux-min]
runs-on: macOS-latest
steps:
- uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand All @@ -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)
Expand Down
22 changes: 21 additions & 1 deletion config.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,5 +736,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"
]
}

0 comments on commit 9dfd73c

Please sign in to comment.