Skip to content

Commit 28ba81b

Browse files
committed
Merge branch 'main' into fix/issue-1067-shared-helpers
Pick up the repository move from nephio-project to kptdev that landed in #981, which rewrote the module path across the codebase. Conflicts were limited to the import blocks of the rpkg lifecycle command files this branch refactors. The resolution keeps the branch's runner embedding and rpkgutil alias while taking main's kptdev import paths. The util/common_test.go file is a new file added by this branch, so main did not touch it, but its imports still needed to be rewritten from the old module path to the canonical kptdev path. Signed-off-by: thc1006 <84045975+thc1006@users.noreply.github.com>
2 parents 78708b3 + 5e3ab70 commit 28ba81b

687 files changed

Lines changed: 2366 additions & 2266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-go-kpt/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2026 The Nephio Authors
1+
# Copyright 2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024-2025 The Nephio Authors
1+
# Copyright 2024-2025 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/gosec-scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, 2026 The Nephio Authors
1+
# Copyright 2024, 2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/image-build-push-dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
build-and-push-image:
18-
if: github.repository_owner == 'nephio-project'
18+
if: github.repository_owner == 'kptdev'
1919
runs-on: ubuntu-latest
2020
strategy:
2121
fail-fast: false

.github/workflows/image-build-push-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
build-and-push-image:
18-
if: github.repository_owner == 'nephio-project'
18+
if: github.repository_owner == 'kptdev'
1919
runs-on: ubuntu-latest
2020
strategy:
2121
fail-fast: false

.github/workflows/porch-compat-matrix.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2026 The Nephio Authors
1+
# Copyright 2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ jobs:
4141
id: releases
4242
env:
4343
GH_TOKEN: ${{ github.token }}
44-
UPSTREAM_REPO: nephio-project/porch
44+
UPSTREAM_REPO: kptdev/porch
4545
run: |
4646
# Always query upstream repo for releases (works correctly from forks)
4747
VERSIONS=$(gh api repos/${UPSTREAM_REPO}/releases \
@@ -80,14 +80,14 @@ jobs:
8080
if: matrix.server_version == 'latest'
8181
uses: actions/checkout@v4
8282
with:
83-
repository: nephio-project/porch
83+
repository: kptdev/porch
8484
ref: '1.5' # NOTE this should revert back to main when we merge back
8585

8686
- name: Checkout upstream tag ${{ matrix.server_version }}
8787
if: matrix.server_version != 'latest'
8888
uses: actions/checkout@v4
8989
with:
90-
repository: nephio-project/porch
90+
repository: kptdev/porch
9191
ref: ${{ matrix.server_version }}
9292

9393
# --- Step 2: Setup tooling ---
@@ -148,7 +148,7 @@ jobs:
148148

149149
- name: Download released CLI versions
150150
run: |
151-
UPSTREAM_REPO="nephio-project/porch"
151+
UPSTREAM_REPO="kptdev/porch"
152152
for VERSION in $(echo "$RELEASES" | jq -r '.[]'); do
153153
VERSION_NUM="${VERSION#v}"
154154
CLI_URL="https://github.com/${UPSTREAM_REPO}/releases/download/${VERSION}/porchctl_${VERSION_NUM}_linux_amd64.tar.gz"

.github/workflows/porch-e2e-ci-jobs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2025-2026 The Nephio Authors
1+
# Copyright 2025-2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/porchctl-dev-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024, 2026 The Nephio Authors
1+
# Copyright 2024, 2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024,2026 The Nephio Authors
1+
# Copyright 2024,2026 The kpt Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

.github/workflows/sonarcloud.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Fix Go module paths in coverage
8989
run: |
90-
sed -i 's|github.com/nephio-project/porch|.|g' coverage.out
90+
sed -i 's|github.com/kptdev/porch|.|g' coverage.out
9191
9292
- name: SonarQube Scan on PR
9393
if: github.event.workflow_run.event == 'pull_request'
@@ -96,8 +96,8 @@ jobs:
9696
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9797
with:
9898
args:
99-
-Dsonar.projectKey=nephio-project_porch
100-
-Dsonar.organization=nephio-project
99+
-Dsonar.projectKey=kptdev_porch
100+
-Dsonar.organization=kptdev
101101
-Dproject.settings=sonar-project.properties
102102
-Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }}
103103
-Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }}
@@ -110,6 +110,6 @@ jobs:
110110
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
111111
with:
112112
args:
113-
-Dsonar.projectKey=nephio-project_porch
114-
-Dsonar.organization=nephio-project
113+
-Dsonar.projectKey=kptdev_porch
114+
-Dsonar.organization=kptdev
115115
-Dproject.settings=sonar-project.properties

0 commit comments

Comments
 (0)