Skip to content

Commit 520c2ca

Browse files
authored
Merge branch 'main' into dependabot/go_modules/code.gitea.io/sdk/gitea-0.24.1
2 parents 8828470 + ac1030b commit 520c2ca

3 files changed

Lines changed: 16 additions & 13 deletions

File tree

.github/workflows/dependabot-auto-merge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818

19-
- name: Enable auto-merge for minor and patch updates
19+
- name: Enable merge for minor and patch updates
2020
if: |
2121
steps.metadata.outputs.update-type == 'version-update:semver-minor' ||
2222
steps.metadata.outputs.update-type == 'version-update:semver-patch'
2323
run: |
24-
gh pr merge --auto --squash "$PR_URL"
25-
gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically once all checks pass."
24+
gh pr merge "$PR_URL"
25+
gh pr comment "$PR_URL" --body "✅ Auto-merge enabled. This PR will merge automatically / added to merge queue, once all checks pass."
2626
env:
2727
PR_URL: ${{ github.event.pull_request.html_url }}
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.25 AS builder
2+
FROM golang:1.26 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

@@ -31,7 +31,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest
3131

3232

3333
# Temporary until we have the latest features (registry-authfile, ...) in a released func cli version
34-
FROM golang:1.25 AS func-cli-builder
34+
FROM golang:1.26 AS func-cli-builder
3535
ARG TARGETOS
3636
ARG TARGETARCH
3737

hack/create-kind-cluster.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ NODE_VERSION="v1.34.0"
1212
REGISTRY_NAME="kind-registry"
1313
REGISTRY_PORT=${REGISTRY_PORT:-"5001"}
1414

15-
SERVING_VERSION="v1.19.0"
16-
EVENTING_VERSION="v1.19.0"
17-
TEKTON_VERSION="v1.6.0"
18-
KEDA_VERSION="v2.17.0"
19-
KEDA_HTTP_ADDON_VERSION="v0.12.1"
15+
SERVING_VERSION="v1.21.0"
16+
EVENTING_VERSION="v1.21.0"
17+
TEKTON_VERSION="v1.11.0"
18+
KEDA_VERSION="v2.19.0"
19+
KEDA_HTTP_ADDON_VERSION="v0.13.0"
20+
21+
GITEA_USER="giteaadmin"
22+
GITEA_PASS="giteapass"
2023

2124
header=$'\e[1;33m'
2225
reset=$'\e[0m'
@@ -117,7 +120,7 @@ EOF
117120

118121
function install_tekton() {
119122
header_text "Install Tekton"
120-
kubectl apply -f https://storage.googleapis.com/tekton-releases/pipeline/previous/${TEKTON_VERSION}/release.yaml
123+
kubectl apply -f https://infra.tekton.dev/tekton-releases/pipeline/previous/${TEKTON_VERSION}/release.yaml
121124
kubectl patch configmap feature-flags -n tekton-pipelines --type merge -p '{"data":{"coschedule":"disabled"}}'
122125

123126
header_text "Waiting for Tekton to be ready..."
@@ -174,8 +177,8 @@ function install_gitea() {
174177
--set service.http.nodePort=30000 \
175178
--set service.ssh.type=NodePort \
176179
--set service.ssh.nodePort=30022 \
177-
--set gitea.admin.username=giteaadmin \
178-
--set gitea.admin.password=giteapass \
180+
--set gitea.admin.username="${GITEA_USER}" \
181+
--set gitea.admin.password="${GITEA_PASS}" \
179182
--set gitea.admin.email=admin@gitea.local \
180183
--set persistence.enabled=false \
181184
--set postgresql-ha.enabled=false \

0 commit comments

Comments
 (0)