From 4680abe951604babf8db7fcdcf4864838a21a901 Mon Sep 17 00:00:00 2001 From: Philip Laine Date: Wed, 5 Oct 2022 12:23:56 +0200 Subject: [PATCH] Update libgit2 version in Azure e2e tests Signed-off-by: Philip Laine --- .github/workflows/e2e-azure.yaml | 9 +++---- tests/azure/azure_test.go | 2 +- tests/azure/go.mod | 2 +- tests/azure/go.sum | 4 +-- tests/azure/terraform/aks/.terraform.lock.hcl | 26 +++++++++---------- tests/azure/util_test.go | 7 +++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/e2e-azure.yaml b/.github/workflows/e2e-azure.yaml index 1019949e..e3f37107 100644 --- a/.github/workflows/e2e-azure.yaml +++ b/.github/workflows/e2e-azure.yaml @@ -9,7 +9,7 @@ on: jobs: e2e: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -26,12 +26,9 @@ jobs: go-version: 1.19.x - name: Install libgit2 run: | - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 - echo "deb http://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list - echo "deb-src http://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list + echo "deb http://archive.ubuntu.com/ubuntu/ kinetic universe" | sudo tee -a /etc/apt/sources.list sudo apt-get update - sudo apt-get install -y --allow-downgrades libgit2-dev/unstable zlib1g-dev/unstable libssh2-1-dev/unstable libpcre3-dev/unstable + sudo apt-get install -y -t kinetic libgit2-dev=1.3.0+dfsg.1-3ubuntu1 - name: Setup Flux CLI run: | make build diff --git a/tests/azure/azure_test.go b/tests/azure/azure_test.go index baf42170..b18fae58 100644 --- a/tests/azure/azure_test.go +++ b/tests/azure/azure_test.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/hc-install/product" "github.com/hashicorp/hc-install/src" "github.com/hashicorp/terraform-exec/tfexec" - git2go "github.com/libgit2/git2go/v31" + git2go "github.com/libgit2/git2go/v33" "github.com/microsoft/azure-devops-go-api/azuredevops" "github.com/microsoft/azure-devops-go-api/azuredevops/git" "github.com/stretchr/testify/require" diff --git a/tests/azure/go.mod b/tests/azure/go.mod index 835f7452..69d9412d 100644 --- a/tests/azure/go.mod +++ b/tests/azure/go.mod @@ -14,7 +14,7 @@ require ( github.com/fluxcd/source-controller/api v0.29.0 github.com/hashicorp/hc-install v0.4.0 github.com/hashicorp/terraform-exec v0.17.3 - github.com/libgit2/git2go/v31 v31.7.9 + github.com/libgit2/git2go/v33 v33.0.9 github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5 github.com/stretchr/testify v1.8.0 github.com/whilp/git-urls v1.0.0 diff --git a/tests/azure/go.sum b/tests/azure/go.sum index 4d47c82b..e7e02e81 100644 --- a/tests/azure/go.sum +++ b/tests/azure/go.sum @@ -337,8 +337,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -github.com/libgit2/git2go/v31 v31.7.9 h1:RUDiYm7+i3GY414acI31oDD8x5P0PZyWeZZfwpPuynE= -github.com/libgit2/git2go/v31 v31.7.9/go.mod h1:c/rkJcBcUFx6wHaT++UwNpKvIsmPNqCeQ/vzO4DrEec= +github.com/libgit2/git2go/v33 v33.0.9 h1:4ch2DJed6IhJO28BEohkUoGvxLsRzUjxljoNFJ6/O78= +github.com/libgit2/git2go/v33 v33.0.9/go.mod h1:KdpqkU+6+++4oHna/MIOgx4GCQ92IPCdpVRMRI80J+4= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= diff --git a/tests/azure/terraform/aks/.terraform.lock.hcl b/tests/azure/terraform/aks/.terraform.lock.hcl index da879d8e..cc3c7846 100644 --- a/tests/azure/terraform/aks/.terraform.lock.hcl +++ b/tests/azure/terraform/aks/.terraform.lock.hcl @@ -42,21 +42,21 @@ provider "registry.terraform.io/hashicorp/azurerm" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.3.2" + version = "3.4.3" hashes = [ - "h1:H5V+7iXol/EHB2+BUMzGlpIiCOdV74H8YjzCxnSAWcg=", - "zh:038293aebfede983e45ee55c328e3fde82ae2e5719c9bd233c324cfacc437f9c", - "zh:07eaeab03a723d83ac1cc218f3a59fceb7bbf301b38e89a26807d1c93c81cef8", - "zh:427611a4ce9d856b1c73bea986d841a969e4c2799c8ac7c18798d0cc42b78d32", - "zh:49718d2da653c06a70ba81fd055e2b99dfd52dcb86820a6aeea620df22cd3b30", - "zh:5574828d90b19ab762604c6306337e6cd430e65868e13ef6ddb4e25ddb9ad4c0", - "zh:7222e16f7833199dabf1bc5401c56d708ec052b2a5870988bc89ff85b68a5388", + "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", + "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", + "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", + "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:b1b2d7d934784d2aee98b0f8f07a8ccfc0410de63493ae2bf2222c165becf938", - "zh:b8f85b6a20bd264fcd0814866f415f0a368d1123cd7879c8ebbf905d370babc8", - "zh:c3813133acc02bbebddf046d9942e8ba5c35fc99191e3eb057957dafc2929912", - "zh:e7a41dbc919d1de800689a81c240c27eec6b9395564630764ebb323ea82ac8a9", - "zh:ee6d23208449a8eaa6c4f203e33f5176fa795b4b9ecf32903dffe6e2574732c2", + "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", + "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", + "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", + "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", + "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", + "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", + "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", + "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", ] } diff --git a/tests/azure/util_test.go b/tests/azure/util_test.go index c49b28d7..2be4ecf1 100644 --- a/tests/azure/util_test.go +++ b/tests/azure/util_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "time" - git2go "github.com/libgit2/git2go/v31" + git2go "github.com/libgit2/git2go/v33" corev1 "k8s.io/api/core/v1" apimeta "k8s.io/apimachinery/pkg/api/meta" @@ -313,12 +313,15 @@ func getRepository(url, branchName string, overrideBranch bool, password string) return nil, "", err } repo, err := git2go.Clone(url, tmpDir, &git2go.CloneOptions{ - FetchOptions: &git2go.FetchOptions{ + FetchOptions: git2go.FetchOptions{ RemoteCallbacks: git2go.RemoteCallbacks{ CredentialsCallback: credentialCallback("git", password), }, }, CheckoutBranch: checkoutBranch, + CheckoutOptions: git2go.CheckoutOpts{ + Strategy: git2go.CheckoutSafe, + }, }) if err != nil { return nil, "", err