Run "go mod tidy" only if Go is >= 1.16

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

.buildkite/pipeline.yml

@@ -65,18 +65,6 @@ steps:
       - test -z "$(git status --porcelain)" && exit 0 || git status && echo -e '\nGenerated protobuf code differs from committed, please run "make proto" and commit the updated files.\n' && exit 1
     timeout_in_minutes: 1
 
-  - label: ":golang: go mod tidy"
-    agents:
-      queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
-      distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
-      hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
-    env:
-      DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
-    command:
-      - make tidy-in-docker
-      - test -z "$(git status --porcelain)" && exit 0 || git status && echo -e '\ngo.mod and/or go.sum differ from committed, please run "go mod tidy" and commit the updated files.\n' && exit 1
-    timeout_in_minutes: 1
-
   - label: ":gear: unit tests"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"

.github/workflows/build.yaml

@@ -47,9 +47,13 @@ jobs:
       - run: |
           make tidy
           git diff --exit-code
-        # The result of "go mod tidy" is different since Go 1.16.
-        # We will use the old result until we update BuildKite and other environments.
-        if: matrix.go < '1.16'
+        # opencontainers/selinux uses Go 1.16's io/fs package with "go1.16"
+        # build tag. However, since go mod tidy acts as like all build tags
+        # are enabled, the file below included in go mod tidy, even
+        # Go is < 1.16.
+        # https://github.com/opencontainers/selinux/blob/v1.9.1/go-selinux/rchcon.go
+        # https://golang.org/ref/mod
+        if: matrix.go >= '1.16'
       - run: |
           make proto
           git diff --exit-code