Merge branch 'develop'

the1ts · Jan 12, 2022 · c88caa5 · c88caa5
2 parents be7ff4a + 25d8a3d
commit c88caa5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -2,9 +2,17 @@ name: Makefile CI
 
 on:
   push:
-    branches: [ develop ]
+    branches: 
+      - develop
+      - feature/**
+      - release/**
+      - master
   pull_request:
-    branches: [ develop ]
+    branches:
+      - develop
+      - feature/**
+      - release/**
+      - master
 
 jobs:
   build:

diff --git a/actions/enotes/listarchivedenotes b/actions/enotes/listarchivedenotes
@@ -41,8 +41,8 @@ cd "${TODO_DIR}/notes/archive/" || exit 1
 
 # Find a list of files
 find . -name "${PRE}-*enc" -printf '%P\n' | grep "^${PRE}-" | \
-  sed  -e "s/^${PRE}-//g" -e "s/^/enote:/g" -e "s/\.enc$//g" -e "s/\.[0-9]\{1,10\}$//g" > \
-  "${TODO_TMP_FILE}"
+  sed  -e "s/^${PRE}-//g" -e "s/^/enote:/g" -e "s/\.enc$//g" -e "s/\.[0-9]\{1,10\}$//g" | \
+  sort > "${TODO_TMP_FILE}"
 if [[ $(grep -c "$*" "${TODO_TMP_FILE}") -gt 0 ]]; then
   grep "$*" "${TODO_TMP_FILE}"
   [[ -f "${TODO_TMP_FILE}" ]] && rm -rf "${TODO_TMP_FILE}"

diff --git a/actions/notes/listarchivednotes b/actions/notes/listarchivednotes
@@ -41,8 +41,8 @@ cd "${TODO_DIR}/notes/archive/" || exit 1
 
 # Find a list of files
 find . -name "${PRE}-*txt" -printf '%P\n'  | grep "^${PRE}-" | \
-  sed  -e "s/${PRE}-//" -e "s/^/note:/" -e "s/.txt$//" -e "s/\.[0-9]\{1,10\}$//g" > \
-  "${TODO_TMP_FILE}"
+  sed  -e "s/${PRE}-//" -e "s/^/note:/" -e "s/.txt$//" -e "s/\.[0-9]\{1,10\}$//g" | 
+  sort > "${TODO_TMP_FILE}"
 if [[ $(grep -c "$*" "${TODO_TMP_FILE}") -gt 0 ]]; then
   grep "$*" "${TODO_TMP_FILE}"
   [[ -f "${TODO_TMP_FILE}" ]] && rm -rf "${TODO_TMP_FILE}"

diff --git a/tests/t4060-listarchivedenotes.sh b/tests/t4060-listarchivedenotes.sh
@@ -18,16 +18,16 @@ Fix bicycle enote:testing
 Ride bike enote:testing
 EOF
 # Create our notes file with some content
-cat > notes/todo-test.enc << EOF                                                         
+cat > notes/todo-test.enc << EOF
 test note first line
 test note second line
 EOF
 # Create our notes file with some content
-cat > ./notes/archive/todo-testing.enc << EOF                                                         
+cat > ./notes/archive/todo-testing.enc << EOF
 test note first line
 test note second line
 EOF
-cat > ./notes/archive/todo-previous.10100000.enc << EOF                                                         
+cat > ./notes/archive/todo-previous.10100000.enc << EOF
 test note first line
 test note second line
 test note third line
@@ -49,8 +49,8 @@ EOF
 
 test_todo_session 'listarchivedenotes all' <<EOF
 >>> todo.sh listarchivedenotes
-enote:testing
 enote:previous
+enote:testing
 === 0
 EOF
 

diff --git a/todo.txt-plugins.code-workspace b/todo.txt-plugins.code-workspace
@@ -1,9 +1,9 @@
 {
 	"folders": [
-		{
-			"path": "."
-		}
-	],
+    {
+      "path": "../../../../../../../net/nas1/volume1/scratcharea/paulbm/git/home/github/todo.txt-plugins"
+    }
+  ],
 	"settings": {
 		"editor.tabSize": 2,
     "editor.detectIndentation": false,
@@ -39,6 +39,10 @@
       {
         "name": "feature/readme_markdown",
         "base": "develop"
+      },
+      {
+        "name": "feature/fix_ci",
+        "base": "develop"
       }
     ]
 	}