Merge branch 'main' into aim-integration-tests-app

suprjinx · Jul 10, 2023 · 6f9bdaf · 6f9bdaf
2 parents 451483d + 4478a35
commit 6f9bdaf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,14 +26,15 @@ jobs:
       # Anything else is invalid.
       - name: Validate ref
         run: |
-          ref=${{ github.event.workflow_run.head_branch }}
-          sha=${{ github.event.workflow_run.head_sha }}
+          ref='${{ github.event.workflow_run.head_branch }}'
+          sha='${{ github.event.workflow_run.head_sha }}'
           case $ref in
             main)
               [ $(git branch --contains=$sha main | wc -l) -eq 1 ] &&
               [ $(git rev-list --count $sha..main) -le 2 ]
               ;;
             v?*)
+              [[ $ref =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] &&
               [ $(git rev-parse refs/tags/$ref) == $sha ] &&
               [ $(git branch --contains=$sha main | wc -l) -eq 1 ]
               ;;
@@ -49,7 +50,7 @@ jobs:
       - name: Compute tags
         id: tags
         run: |
-          ref=${{ github.event.workflow_run.head_branch }}
+          ref='${{ github.event.workflow_run.head_branch }}'
           case $ref in
             main)
               tags=("main" "edge")

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ fasttrackml
 
 # Local database
 fasttrackml.db*
+encrypted.db*
 
 # Imported integration tests
 tests/integration/python/*/*.src
@@ -20,3 +21,7 @@ mock_*
 
 # Misc
 .DS_Store
+
+# Optional workspace
+go.work
+*.code-workspace
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,47 +10,51 @@
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}",
+            "buildFlags": "-tags '${config:go.buildTags}'",
             "args": [
                 "server",
                 "--database-uri",
                 "postgres://postgres:postgres@localhost/postgres"
-            ]
+            ],
         },
         {
             "name": "Launch server (sqlite memory)",
             "type": "go",
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}",
+            "buildFlags": "-tags '${config:go.buildTags}'",
             "args": [
                 "server",
                 "--database-uri",
                 "sqlite://fasttrackml.db?mode=memory&cache=shared"
-            ]
+            ],
         },
         {
             "name": "Launch server (sqlite file)",
             "type": "go",
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}",
+            "buildFlags": "-tags '${config:go.buildTags}'",
             "args": [
                 "server",
                 "--database-uri",
                 "sqlite://fasttrackml.db"
-            ]
+            ],
         },
         {
             "name": "Launch server (encrypted sqlite file)",
             "type": "go",
             "request": "launch",
             "mode": "auto",
             "program": "${workspaceFolder}",
+            "buildFlags": "-tags '${config:go.buildTags}'",
             "args": [
                 "server",
                 "--database-uri",
                 "sqlite://encrypted.db?_key=passphrase"
-            ]
+            ],
         }
     ]
 }