Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix branch update permissions errors #79

Merged
merged 8 commits into from
Jul 26, 2024
+15 −8
Merged

Fix branch update permissions errors #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db4bfa0
Testing trying old PAT
kfcampbell Jul 25, 2024
dab8333
Try old author
kfcampbell Jul 25, 2024
a50f586
Actually swap to old token in .NET
kfcampbell Jul 25, 2024
86abce9
Try new author
kfcampbell Jul 25, 2024
27e67ed
Undo unnecessary Go changes
kfcampbell Jul 25, 2024
48d9903
Do not try to switch to branch before fetching
kfcampbell Jul 25, 2024
5e95850
Add logic to check if remote branch exists, not local branch
kfcampbell Jul 25, 2024
8fa233f
Make same branch changes for Go build
kfcampbell Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/build-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ jobs:

- name: Run scripts/generate-dotnet.sh
run: scripts/generate-dotnet.sh ${{ matrix.platform }}

- name: Clean up build artifacts before syncing
run: dotnet clean stage/dotnet/$REPO_NAME/GitHub.Octokit.sln

- name: Clone the existing repository
run: |
cd ../
git clone https://github.com/octokit/$REPO_NAME.git

- name: Copy generated code to dotnet-sdk
run: |
run: |
cp -rf stage/dotnet/$REPO_NAME/. ../$REPO_NAME/ # copy everything
rsync -av --delete stage/dotnet/$REPO_NAME/src/ ../$REPO_NAME/src/ # delete files that are not generated

Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Run scripts/generate-dotnet.sh
run: scripts/generate-dotnet.sh ghes ${{ matrix.version }}

- name: Clean up build artifacts before syncing
run: dotnet clean stage/dotnet/dotnet-sdk-enterprise-server/GitHub.Octokit.sln

Expand All @@ -97,10 +97,14 @@ jobs:
cd ../
git clone https://github.com/octokit/dotnet-sdk-enterprise-server.git
cd dotnet-sdk-enterprise-server
if git show-ref --verify --quiet refs/heads/${{ matrix.version }}; then
git switch ${{ matrix.version }}
git fetch origin
if git show-ref --verify --quiet refs/remotes/origin/${{ matrix.version }}; then
git switch -c ${{ matrix.version }} --track origin/${{ matrix.version }}
echo "Branch ${{ matrix.version }} already exists; skipping creation and fetching from remote"
else
git switch -c ${{ matrix.version }}
echo "Branch ${{ matrix.version }} does not exist on remote; created locally"
git switch -
fi
cd ../

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,13 @@ jobs:
cd ../
git clone https://github.com/octokit/go-sdk-enterprise-server.git
cd go-sdk-enterprise-server
if git show-ref --verify --quiet refs/heads/${{ matrix.version }}; then
git switch ${{ matrix.version }}
if git show-ref --verify --quiet refs/remotes/origin/${{ matrix.version }}; then
git switch -c ${{ matrix.version }} --track origin/${{ matrix.version }}
echo "Branch ${{ matrix.version }} already exists; skipping creation and fetching from remote"
else
git switch -c ${{ matrix.version }}
echo "Branch ${{ matrix.version }} does not exist on remote; created locally"
git switch -
fi
cd ../

Expand Down
Loading