Reconfigure renovate; we can't use self hosted instance here (no cred…

.github/renovate.json5

@@ -22,6 +22,7 @@
   ],
   postUpdateOptions: [
     'gomodTidy',
+    'gomodUpdateImportPaths'
   ],
   // All PRs should have a label
   labels: [
@@ -162,45 +163,6 @@
   // Renovate evaluates all packageRules in order, so low priority rules should
   // be at the beginning, high priority at the end
   packageRules: [
-    {
-      description: 'Generate code after upgrading go dependencies (main)',
-      matchDatasources: [
-        'go',
-      ],
-      // Currently we only have an Earthfile on main and some release branches, so we ignore the ones we know don't have it.
-      matchBaseBranches: [
-        '!/release-1\.16/',
-      ],
-      postUpgradeTasks: {
-        commands: [
-          'earthly --strict +go-generate',
-        ],
-        fileFilters: [
-          '**/*',
-        ],
-        executionMode: 'update',
-      },
-    },
-    {
-      description: 'Lint code after upgrading golangci-lint (main)',
-      matchDepNames: [
-        'golangci/golangci-lint',
-      ],
-      // Currently we only have an Earthfile on main and some release branches, so we ignore the ones we know don't have it.
-      matchBaseBranches: [
-        '!/release-1\.16/',
-      ],
-      postUpgradeTasks: {
-        // Post-upgrade tasks that are executed before a commit is made by Renovate.
-        commands: [
-          'earthly --strict +go-lint',
-        ],
-        fileFilters: [
-          '**/*',
-        ],
-        executionMode: 'update',
-      },
-    },
     {
       matchManagers: [
         'crossplane',
@@ -210,13 +172,6 @@
       ],
       groupName: 'e2e-manifests',
     },
-    {
-      description: 'Ignore non-security related updates to release branches',
-      matchBaseBranches: [
-        '/^release-.*/',
-      ],
-      enabled: false,
-    },
     {
       description: 'Still update Docker images on release branches though',
       matchDatasources: [

.github/workflows/pr.yml

@@ -5,12 +5,7 @@ on:
     types: [opened, edited, synchronize]
 
 jobs:
-  who-am-i:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Who am I?
-        run: |
-          echo "Actor: ${{ github.actor }}"
+
   checklist-completed:
     if: github.actor != 'renovate[bot]'
     runs-on: ubuntu-22.04

Earthfile

@@ -13,7 +13,7 @@ fetch-crossplane-clusters:
 # fetch-crossplane-cluster fetches the cluster directory from crossplane/crossplane
 # at the git revision corresponding to CROSSPLANE_IMAGE_TAG
 fetch-crossplane-cluster:
-  ARG CROSSPLANE_IMAGE_TAG=release-1.20
+  ARG CROSSPLANE_IMAGE_TAG=main
   ARG CROSSPLANE_REPO=https://github.com/crossplane/crossplane.git
   ARG SAVE_LOCALLY=true
   FROM alpine/git:latest
@@ -68,7 +68,6 @@ multiplatform-build:
 # generated, for example when you update an API type.
 generate:
   BUILD +go-modules-tidy
-  BUILD +go-generate
 
 e2e-matrix:
   BUILD +e2e \
@@ -103,6 +102,7 @@ e2e:
   COPY +go-build-e2e/e2e .
   # Fetch the cluster directory from the crossplane repo at the specified tag
   COPY (+fetch-crossplane-cluster/${CROSSPLANE_IMAGE_TAG} --CROSSPLANE_IMAGE_TAG=${CROSSPLANE_IMAGE_TAG} --SAVE_LOCALLY=${SAVE_LOCALLY}) cluster/${CROSSPLANE_IMAGE_TAG}
+  BUILD +patch-crds --CROSSPLANE_IMAGE_TAG=${CROSSPLANE_IMAGE_TAG}
   COPY --dir test .
   TRY
     # Using a static CROSSPLANE_VERSION allows Earthly to cache E2E runs as long
@@ -111,8 +111,8 @@ e2e:
     WITH DOCKER --pull crossplane/crossplane:${CROSSPLANE_IMAGE_TAG}
       # TODO(negz:) Set GITHUB_ACTIONS=true and use RUN --raw-output when
       # https://github.com/earthly/earthly/issues/4143 is fixed.
-      #RUN gotestsum --no-color=false --format testname --junitfile e2e-tests.xml --raw-command go tool test2json -t -p E2E ./e2e -test.v -crossplane-image=crossplane/crossplane:${CROSSPLANE_IMAGE_TAG} ${FLAGS}
-      RUN gotestsum --no-color=false --format standard-verbose --junitfile e2e-tests.xml --raw-command go tool test2json -t -p E2E ./e2e -test.v -crossplane-image=crossplane/crossplane:${CROSSPLANE_IMAGE_TAG} ${FLAGS}
+      RUN gotestsum --no-color=false --format testname --junitfile e2e-tests.xml --raw-command go tool test2json -t -p E2E ./e2e -test.v -crossplane-image=crossplane/crossplane:${CROSSPLANE_IMAGE_TAG} ${FLAGS}
+      #RUN gotestsum --no-color=false --format standard-verbose --junitfile e2e-tests.xml --raw-command go tool test2json -t -p E2E ./e2e -test.v -crossplane-image=crossplane/crossplane:${CROSSPLANE_IMAGE_TAG} ${FLAGS}
     END
   FINALLY
     SAVE ARTIFACT --if-exists e2e-tests.xml AS LOCAL _output/tests/e2e-tests.xml
@@ -140,8 +140,10 @@ go-modules-tidy:
   SAVE ARTIFACT go.mod AS LOCAL go.mod
   SAVE ARTIFACT go.sum AS LOCAL go.sum
 
-# go-generate runs Go code generation.
-go-generate:
+# patch-crds patches CRDs fetched from crossplane/crossplane.  used to be called go-generate, but we don't actually
+# do any go generation here anymore.  we can't run this under the upper-level +generate target because it generates
+# changes under the /cluster directory, which while gitignored will fail the PR check for changed generated files.
+patch-crds:
   ARG CROSSPLANE_IMAGE_TAG=main
   FROM +go-modules
   CACHE --id go-build --sharing shared /root/.cache/go-build
@@ -213,6 +215,7 @@ go-test:
   ARG KUBE_VERSION=1.30.3
   ARG CROSSPLANE_IMAGE_TAG=main
   BUILD +fetch-crossplane-cluster
+  BUILD +patch-crds
   FROM +go-modules
   DO github.com/earthly/lib+INSTALL_DIND
   CACHE --id go-build --sharing shared /root/.cache/go-build