From a4b40bd139c5c4b0c259fcf1ca0a609ccd70c309 Mon Sep 17 00:00:00 2001 From: Mohamed Date: Thu, 2 Jun 2022 09:48:45 +0200 Subject: [PATCH] remove changes added to some files by mistake Signed-off-by: Mohamed Sekour --- .drone.yml | 63 +------------------ .../git_helper_for_declarative_test.go | 11 ---- package-lock.json | 3 +- 3 files changed, 2 insertions(+), 75 deletions(-) diff --git a/.drone.yml b/.drone.yml index a45e0d9e8e65..d6ad08713ec5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1061,67 +1061,6 @@ steps: exclude: - pull_request ---- -kind: pipeline -name: docker-linux-amd64-release-branch - -platform: - os: linux - arch: amd64 - -depends_on: - - testing-amd64 - - testing-arm64 - -trigger: - ref: - - "refs/heads/release/v*" - event: - exclude: - - cron - -steps: - - name: fetch-tags - image: docker:git - commands: - - git fetch --tags --force - - - name: publish - pull: always - image: techknowlogick/drone-docker:latest - settings: - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64 - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.cn - password: - from_secret: docker_password - username: - from_secret: docker_username - when: - event: - exclude: - - pull_request - - - name: publish-rootless - image: techknowlogick/drone-docker:latest - settings: - dockerfile: Dockerfile.rootless - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.cn - password: - from_secret: docker_password - username: - from_secret: docker_username - when: - event: - exclude: - - pull_request - --- kind: pipeline type: docker @@ -1485,4 +1424,4 @@ steps: webhook_id: from_secret: discord_webhook_id webhook_token: - from_secret: discord_webhook_token + from_secret: discord_webhook_token \ No newline at end of file diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go index e2e0a0508c27..1ea594b739c8 100644 --- a/integrations/git_helper_for_declarative_test.go +++ b/integrations/git_helper_for_declarative_test.go @@ -117,17 +117,6 @@ func doPartialGitClone(dstLocalPath string, u *url.URL) func(*testing.T) { } } -func doPartialGitClone(dstLocalPath string, u *url.URL) func(*testing.T) { - return func(t *testing.T) { - assert.NoError(t, git.CloneWithArgs(context.Background(), u.String(), dstLocalPath, allowLFSFilters(), git.CloneRepoOptions{ - Filter: "blob:none", - })) - exist, err := util.IsExist(filepath.Join(dstLocalPath, "README.md")) - assert.NoError(t, err) - assert.True(t, exist) - } -} - func doGitCloneFail(u *url.URL) func(*testing.T) { return func(t *testing.T) { tmpDir, err := os.MkdirTemp("", "doGitCloneFail") diff --git a/package-lock.json b/package-lock.json index cf3a32272e76..9795c4b1f3f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18215,8 +18215,7 @@ "dev": true }, "write-file-atomic": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.0.tgz", + "version": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.0.tgz", "integrity": "sha512-JhcWoKffJNF7ivO9yflBhc7tn3wKnokMUfWpBriM9yCXj4ePQnRPcWglBkkg1AHC8nsW/EfxwwhqsLtOy59djA==", "dev": true, "requires": {