diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e254298f..a9172a5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,6 +172,7 @@ build-darwin-qa: extends: .build-darwin-base only: - web + - branches script: - BUILD_TAGS="build_qa" make build artifacts: diff --git a/Makefile b/Makefile index 049798c4..29e94d64 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ hasher: ${TGZ_TARGET}: ${DEPLOY_DIR}/${TARGET_OS} rm -f $@ - cd ${DEPLOY_DIR}/${TARGET_OS} && tar czf ../../../../$@ . + cd ${DEPLOY_DIR}/${TARGET_OS} && tar -czf ../../../../$@ . ${DEPLOY_DIR}/linux: ${EXE_TARGET} cp -pf ./internal/frontend/share/${SRC_SVG} ${DEPLOY_DIR}/linux/logo.svg diff --git a/internal/frontend/qml/BugReportView.qml b/internal/frontend/qml/BugReportView.qml index a29c9d14..d5db8757 100644 --- a/internal/frontend/qml/BugReportView.qml +++ b/internal/frontend/qml/BugReportView.qml @@ -127,19 +127,10 @@ SettingsView { } TextEdit { - text: { - var address = "bridge@protonmail.com" - var mailTo = `${address}` - return "" +qsTr( - "These reports are not end-to-end encrypted. In case of sensitive information, contact us at %1." - ).arg(mailTo) - } - onLinkActivated: Qt.openUrlExternally(link) - textFormat: Text.RichText + text: qsTr("Reports are not end-to-end encrypted, please do not send any sensitive information.") readOnly: true - Layout.fillWidth: true color: root.colorScheme.text_weak font.family: ProtonStyle.font_family diff --git a/internal/store/cooldown_test.go b/internal/store/cooldown_test.go index 88fa27fb..eb96090d 100644 --- a/internal/store/cooldown_test.go +++ b/internal/store/cooldown_test.go @@ -127,6 +127,6 @@ func TestCooldownNotSooner(t *testing.T) { assert.True(t, testCooldown.isTooSoon()) // After given wait time it shouldn't be soon anymore. - time.Sleep(waitTime / 2) + time.Sleep(waitTime/2 + time.Millisecond) assert.False(t, testCooldown.isTooSoon()) } diff --git a/pkg/parallel/parallel_test.go b/pkg/parallel/parallel_test.go index 628a5dc4..67805ed0 100644 --- a/pkg/parallel/parallel_test.go +++ b/pkg/parallel/parallel_test.go @@ -34,7 +34,7 @@ var ( wantOutput = []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10} testProcessSleep = 100 // ms runParallelTimeOverhead = 150 // ms - windowsCIExtra = 250 // ms - estimated experimentally + windowsCIExtra = 500 // ms - estimated experimentally ) func TestParallel(t *testing.T) {