Unbreak CI after v3 merge (addresses #952)

.github/workflows/tests.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-    - master
+    - main
   schedule:
     # Weekly.
     - cron: "0 0 * * 0"
@@ -13,40 +13,31 @@ jobs:
     name: Check track configuration
     runs-on: ubuntu-latest
     steps:
-      # master is needed in addition to HEAD,
-      # because the README check only checks exercises changed since master.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
         with:
-          ref: master
+          # main is needed in addition to HEAD, because the README check only
+          # checks exercises changed since main. This fetches the entire repo's
+          # history.
+          fetch-depth: 0
 
-      - uses: actions/checkout@v2
+      - name: Fetch configlet
+        uses: exercism/github-actions/configlet-ci@main
 
-      - name: Fetch
-        run: bin/fetch-configlet
+      - name: Configlet Linter
+        run: configlet lint
 
-      - name: Lint
-        run: bin/configlet lint .
+      - name: Ensure practice exercise descriptions are synced
+        run: bin/ensure-practice-exercise-descriptions-are-synced.sh
 
-      - name: Ensure READMEs are updated
-        run: sh ./bin/ensure-readmes-are-updated.sh
-
-      - name: Check configlet fmt
-        run: sh ./bin/check-configlet-fmt.sh
-
-      - name: Install yq (for stack resolvers)
-        run: |
-         sudo add-apt-repository -y ppa:rmescandon/yq
-         sudo apt-get -q update
-         sudo apt-get -y install yq
-
-      - name: Ensure stack resolvers synced
-        run: sh ./bin/ensure-stack-resolvers-synced.sh
+      - name: Ensure stack resolvers are synced
+        run: bin/ensure-stack-resolvers-are-synced.sh
 
       - name: Check for invalid UUIDs
         # can be removed once `configlet lint` gains this ability.
         # Check issue https://github.com/exercism/configlet/issues/99
+        # XXX: Consider adding this check for concept exercises.
         run: |
-          uuids=$(jq --raw-output '.exercises | map(.uuid) | .[]' config.json)
+          uuids=$(jq --raw-output '.exercises.practice | map(.uuid) | .[]' config.json)
           bad_uuid=$(echo "$uuids" | grep -vE '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$' || true)
           if [ -n "$bad_uuid" ]; then
             echo "invalid UUIDs found! please correct these to be valid UUIDs:"
@@ -80,13 +71,7 @@ jobs:
     # https://github.com/actions/toolkit/issues/399
     continue-on-error: ${{ matrix.resolver == 'nightly' }}
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Install yq (for stack resolvers)
-        run: |
-         sudo add-apt-repository -y ppa:rmescandon/yq
-         sudo apt-get -q update
-         sudo apt-get -y install yq
+      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Resolve resolver
         id: resolve-resolver
@@ -98,7 +83,7 @@ jobs:
           # because that would cause caches from differing LTSes to collide
           # (if we have updated the LTS version of all exercises between job runs).
           if [ "${{ matrix.resolver }}" = "lts-from-exercises" ]; then
-            resolver=$(yq read "$(ls -1 exercises/*/stack.yaml | head -1)" resolver)
+            resolver=$(jq --raw-output .resolver config/track-specific.json)
           else
             resolver=${{ matrix.resolver }}
           fi
@@ -148,7 +133,7 @@ jobs:
             export SET_RESOLVER="--resolver ${{ matrix.resolver }}"
           fi
 
-          for exercise in ${{ github.workspace }}/exercises/*/; do
+          for exercise in ${{ github.workspace }}/exercises/practice/*; do
             time bin/test-stub $exercise
             time bin/test-all-examples $exercise
           done

bin/ensure-practice-exercise-descriptions-are-synced.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Check that practice exercise descriptions are in sync with problem-specifications.
+
+override_message="I have confirmed that no README check is needed"
+
+# If *any* commit message contains the override message:
+if git log origin/main..HEAD | grep -q "$override_message"; then
+  echo "WARNING: You've overridden the README check, which applies to ALL commits in this PR."
+  echo "No practice exercise description in this PR will be checked for changes."
+  exit 0
+fi
+
+newline=$'\n  '
+
+changed_practice_exercises() {
+  branch_name="$(git rev-parse --abbrev-ref HEAD)"
+  git diff --name-only "origin/main..$branch_name" | \
+    grep -Po '(?<=^exercises/practice/)\w+' | sort -fu
+}
+
+missing_readmes=""
+for exercise in $(changed_practice_exercises); do
+  echo "Checking readme for $exercise"
+
+  instructions_path="exercises/practice/$exercise/.docs/instructions.md"
+  if [ ! -f "$instructions_path" ]; then
+    missing_readmes="$missing_readmes$newline$exercise"
+  fi
+done
+
+if [ -n "$missing_readmes" ]; then
+  echo "Exercises missing instructions.md:$missing_readmes"
+fi
+if [ -n "$missing_readmes" ]; then
+   exit 1
+fi

config.json

@@ -1182,5 +1182,7 @@
   },
   "concepts": [],
   "key_features": [],
-  "tags": []
+  "tags": [
+    "paradigm/functional"
+  ]
 }

config/track-specific.json

@@ -0,0 +1,4 @@
+{
+  "#comment": "This file contains track-specific settings for the Haskell track.",
+  "resolver": "lts-16.21"
+}

exercises/practice/isogram/.docs/instructions.md

@@ -12,3 +12,5 @@ Examples of isograms:
 - six-year-old
 
 The word *isograms*, however, is not an isogram, because the s repeats.
+
+Oh my god.