Skip to content

Commit 7b420d1

Browse files
authored
Merge branch 'main' into srvkp-8619-enable-cel-expression-evaluation
2 parents 17912a6 + 7ea8473 commit 7b420d1

File tree

16 files changed

+653
-186
lines changed

16 files changed

+653
-186
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
TEST_BITBUCKET_CLOUD_E2E_REPOSITORY: cboudjna/pac-e2e-tests
5353
TEST_BITBUCKET_CLOUD_USER: cboudjna
5454
TEST_EL_URL: http://controller.paac-127-0-0-1.nip.io
55-
TEST_GITEA_API_URL: http://localhost:3000
55+
TEST_GITEA_API_URL: http://forgejo.paac-127-0-0-1.nip.io
5656
TEST_GITEA_USERNAME: pac
5757
TEST_GITEA_PASSWORD: pac
5858
TEST_GITEA_REPO_OWNER: pac/pac
@@ -342,7 +342,7 @@ jobs:
342342
343343
- name: Upload artifacts
344344
if: ${{ always() }}
345-
uses: actions/upload-artifact@v5
345+
uses: actions/upload-artifact@v6
346346
with:
347347
name: logs-e2e-tests-${{ matrix.provider }}
348348
path: /tmp/logs

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ SHELL := bash
1616
TOPDIR := $(shell git rev-parse --show-toplevel)
1717
TMPDIR := $(TOPDIR)/tmp
1818
HUGO_BIN := $(TMPDIR)/hugo/hugo
19-
PY_FILES := $(shell find . -type f -regex ".*\.py" -not -regex ".*\.venv/.*" -print)
20-
SH_FILES := $(shell find hack/ -type f -regex ".*\.sh" -not -regex ".*\.venv/.*" -print)
21-
YAML_FILES := $(shell find . -not -regex '^./vendor/.*' -type f -regex ".*y[a]ml" -print)
22-
MD_FILES := $(shell find . -type f -regex ".*md" -not -regex '^./tmp/.*' -not -regex '^./vendor/.*' -not -regex ".*\.venv/.*" -not -regex '^./.vale/.*' -not -regex "^./docs/themes/.*" -not -regex "^./.git/.*" -print)
19+
PY_FILES := $(shell find . -type f -name "*.py" -not -path "./worktrees/*" -not -path "*/.venv/*" -print)
20+
SH_FILES := $(shell find hack/ -type f -name "*.sh" -not -path "./worktrees/*" -not -path "*/.venv/*" -print)
21+
YAML_FILES := $(shell find . -type f \( -name "*.yml" -o -name "*.yaml" \) -not -path "./.vale/*" -not -path "./docs/themes/hugo-book/.github/*" -not -path "./worktrees/*" -not -path "./vendor/*" -print)
22+
MD_FILES := $(shell find . -type f -name "*.md" -not -path "./tmp/*" -not -path "./vendor/*" -not -path "*/.venv/*" -not -path "./.vale/*" -not -path "./docs/themes/*" -not -path "./.git/*" -not -path "./worktrees/*" -print)
2323

2424
ifeq ($(PAC_VERSION),)
2525
PAC_VERSION="$(shell git describe --tags --exact-match 2>/dev/null || echo nightly-`date +'%Y%m%d'`-`git rev-parse --short HEAD`)"

hack/dev/kind/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Usage
22

3-
See <https://pipelinesascode.com/docs/dev/> for how to use it.
3+
Use [startpaac](https://github.com/chmouel/startpaac/) which is better for local dev or if you really want to use those script you can go over <https://pipelinesascode.com/docs/dev/> for how to use it.
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Gitea in a Pod for PAC
1+
# Forgejo in a Pod for PAC
22

3-
This will :
3+
This will:
44

5-
- spin a gitea deployment into a namespace
6-
- create a ingress to a URL
5+
- spin a Forgejo deployment into a namespace
6+
- create an ingress to a URL
77
- create a repository
88
- create a user/password
99
- create a token for user/password
10-
- create a empty repository
10+
- create an empty repository
1111
- create a hook to go to a hook.pipelinesascode.com URL
1212
- create a deployment with gosmee to forward smee URL to the pipelines as code controller
13-
- create a rpo crd to bind to it.
13+
- create a repo crd to bind to it
1414
- create a secret for the Git provider with the token generated previously
1515

16-
You can easily configure the script using environment variable see the top of the files for the list.
16+
You can easily configure the script using environment variables, see the top of the files for the list.
1717

18-
designed to run on kind.
18+
Designed to run on kind.

0 commit comments

Comments
 (0)