added go 1.21

upbound · Feb 28, 2024 · 2752438 · 2752438
1 parent 3205692
commit 2752438
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -12,6 +12,7 @@ jobs:
     secrets:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
       UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
@@ -21,19 +22,10 @@ jobs:
 =======
 >>>>>>> 6f9016f (=> go 1.21)
 <<<<<<< HEAD
-      UPTEST_CLOUD_CREDENTIALS: "not used"
-      UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
-=======
-      # UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
-      # UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
->>>>>>> f5121f5 (added DATADOG keys to e2e.yml workflow)
-=======
-      UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
 =======
+>>>>>>> 064e6b3 (added go 1.21)
       UPTEST_CLOUD_CREDENTIALS: "not used"
->>>>>>> 993ea8c (=> go 1.21)
       UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
->>>>>>> 9bd8119 (added Uptest creds)
       DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
       DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }}
 >>>>>>> 1bd1b7f (added DATADOG keys to e2e.yml workflow)