GODT-1833: Change test paths, reset gomod.

.gitlab-ci.yml

@@ -21,12 +21,11 @@ image: gitlab.protontech.ch:4567/go/bridge-internal:go18
 before_script:
   - eval $(ssh-agent -s)
   - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-
   - mkdir -p .cache/bin
   - export PATH=$(pwd)/.cache/bin:$PATH
   - export GOPATH="$CI_PROJECT_DIR/.cache"
-
   - make install-dev-dependencies
+  - git checkout .
 
 cache:
   key: go18-mod
@@ -211,8 +210,9 @@ build-darwin-qa:
     - export GO111MODULE=on
     - export PATH="${GOPATH}/bin:${PATH}"
     - export MSYSTEM=
-    - export QT6DIR=/c/grrrQt/6.3.1/
-    - export PATH="${QT6DIR}/bin:${PATH}"
+    - export QT6DIR=/c/grrrQt/6.3.1/msvc2019_64
+    - export PATH=$PATH:${QT6DIR}/bin
+    - export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH"
   script:
     - make build
     - git diff && git diff-index --quiet HEAD

Makefile

@@ -192,6 +192,7 @@ install-git-hooks:
 .PHONY: check-has-go check-build-essentials add-license change-copyright-year test bench coverage mocks lint-license lint-golang lint updates doc release-notes
 check-has-go:
 	@which go || (echo "Install Go-lang!" && exit 1)
+	go version
 
 
 check_is_installed=if ! which $(1) > /dev/null; then echo "Please install $(1)"; exit 1; fi
@@ -215,25 +216,8 @@ change-copyright-year:
 	./utils/missing_license.sh change-year
 
 test: gofiles
-	@# Listing packages manually to not run Qt folder (which needs to run qtsetup first) and integration tests.
 	go test -coverprofile=/tmp/coverage.out -run=${TESTRUN} \
-		./internal/api/... \
-		./internal/bridge/... \
-		./internal/config/... \
-		./internal/constants/... \
-		./internal/cookies/... \
-		./internal/crash/... \
-		./internal/events/... \
-		./internal/frontend/cli/... \
-		./internal/imap/... \
-		./internal/locations/... \
-		./internal/logging/... \
-		./internal/metrics/... \
-		./internal/smtp/... \
-		./internal/store/... \
-		./internal/updater/... \
-		./internal/users/... \
-		./internal/versioner/... \
+		./internal/...\
 		./pkg/...
 
 bench:

utils/credits.sh

@@ -30,7 +30,7 @@ egrep $'^\t[^=>]*$' $LOCKFILE  | sed -r 's/\t([^ ]*) v.*/\1/g' > $TEMPFILE1
 egrep $'^\t.*=>.*v.*$' $LOCKFILE  | sed -r 's/^.*=> ([^ ]*)( v.*)?/\1/g' >> $TEMPFILE1
 cat $TEMPFILE1 | egrep -v 'therecipe/qt/internal|therecipe/env_.*_512|protontech' | sort | uniq > $TEMPFILE2
 # Add non vendor credits
-echo -e "\nFont Awesome 4.7.0\n\nQt 5.13 by Qt group\n" >> $TEMPFILE2
+echo -e "\nQt 6.3.1 by Qt group\n" >> $TEMPFILE2
 # join lines
 sed -i -e ':a' -e 'N' -e '$!ba' -e 's|\n|;|g' $TEMPFILE2