Skip to content

Commit f71f108

Browse files
Commented the merge to test
1 parent 682f26d commit f71f108

1 file changed

Lines changed: 22 additions & 8 deletions

File tree

.github/workflows/release.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,23 @@ jobs:
128128
129129
- name: Clone target repository and push changes via PR
130130
env:
131-
GH_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
131+
GH_TOKEN: ${{ secrets.ECLIPSE_SITE_TOKEN }}
132132
run: |
133-
git clone https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/CheckmarxDev/ast-eclipse-plugin-update-site.git update-site
133+
# Clone the repository
134+
git clone https://x-access-token:${{ secrets.ECLIPSE_SITE_TOKEN }}@github.com/CheckmarxDev/ast-eclipse-plugin-update-site.git update-site
134135
cd update-site
136+
137+
# Ensure Git LFS is installed
135138
git lfs install
139+
140+
# Configure Git user to prevent commit errors
136141
git config --global user.email "cylon-bot@checkmarx.com"
137142
git config --global user.name "cylon-bot"
143+
144+
# Fetch all branches
138145
git fetch --all
139146
147+
# Ensure the branch exists and check it out
140148
if git show-ref --verify --quiet refs/remotes/origin/${{ env.GH_BRANCH_NAME }}; then
141149
echo "Branch ${{ env.GH_BRANCH_NAME }} exists remotely."
142150
git checkout -B ${{ env.GH_BRANCH_NAME }} origin/${{ env.GH_BRANCH_NAME }}
@@ -152,23 +160,29 @@ jobs:
152160
echo "===== Files BEFORE COPY ====="
153161
ls -lh ../com.checkmarx.eclipse.site/target/repository/
154162
163+
# Copy new files without deleting .git directory
155164
rsync -av --delete --exclude='.git' ../com.checkmarx.eclipse.site/target/repository/ ./
156165
166+
# Debugging: List files in repository after copying
157167
echo "===== Files AFTER COPY ====="
158168
ls -lh .
159169
170+
# Dynamically track all .jar files in the plugins/ and features/ directories
160171
find plugins -name "*.jar" -exec git lfs track {} +
161172
find features -name "*.jar" -exec git lfs track {} +
162173
174+
# Ensure .gitattributes is added
163175
git add .gitattributes
164176
git add .
165177
178+
# Debugging: Show LFS-tracked files
166179
echo "===== Git LFS-tracked files ====="
167180
git lfs ls-files
168181
169182
git commit -m "Update Eclipse update site for ${{ env.GH_RELEASE_TAG_NAME }} (${{ inputs.jira_ticket }})" || echo "No changes to commit"
170183
171-
git remote set-url origin https://x-access-token:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/CheckmarxDev/ast-eclipse-plugin-update-site.git
184+
# Ensure the correct remote URL
185+
git remote set-url origin https://x-access-token:${{ secrets.ECLIPSE_SITE_TOKEN }}@github.com/CheckmarxDev/ast-eclipse-plugin-update-site.git
172186
173187
# Push the feature branch
174188
git push origin "$FEATURE_BRANCH"
@@ -182,11 +196,11 @@ jobs:
182196
--body "Automated update of Eclipse update site for release ${{ env.GH_RELEASE_TAG_NAME }}."
183197
184198
# Squash and merge the PR, then delete the branch
185-
gh pr merge \
186-
--repo CheckmarxDev/ast-eclipse-plugin-update-site \
187-
--squash \
188-
--auto \
189-
--delete-branch
199+
# gh pr merge \
200+
# --repo CheckmarxDev/ast-eclipse-plugin-update-site \
201+
# --squash \
202+
# --auto \
203+
# --delete-branch
190204
191205

192206

0 commit comments

Comments
 (0)