From f35267cfce5adb9c302154918342b5d4ce354dba Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Tue, 15 Feb 2022 11:10:57 +0100 Subject: [PATCH 1/2] Change workflow settings to run on main branch --- .github/workflows/android.yml | 4 ++-- .github/workflows/go.yml | 4 ++-- .github/workflows/ios.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1f4859a..33b2f13 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -2,9 +2,9 @@ name: Gomobile for Android on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 810ae7f..02461b2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,9 +2,9 @@ name: Go test and lint on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 1749514..5def9b3 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -2,9 +2,9 @@ name: Gomobile for iOS on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: From e58ddd50e785711f8cb4b13bfded9bc90e8b5c86 Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Tue, 15 Feb 2022 11:14:55 +0100 Subject: [PATCH 2/2] Fix linter --- .golangci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 6f032cd..1a14b3c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -43,4 +43,5 @@ linters: - wrapcheck # Force wrapping of external error TODO: when the bug is fixed update the linter - gomoddirectives # Prohibits the use of replace statements - varnamelen # Forbids short var names - - ireturn # Prevents returning interfaces \ No newline at end of file + - ireturn # Prevents returning interfaces + - forcetypeassert # Forces to assert types in tests \ No newline at end of file