Merge remote-tracking branch 'upstream/main' into upstream-merge

This commit is contained in:
Sam Heinz
2025-01-09 13:56:22 +10:00
5 changed files with 75 additions and 22 deletions
+19 -5
View File
@@ -1,29 +1,43 @@
name: Validate filenames name: Validate filenames
on: on:
pull_request: pull_request_target:
paths: paths:
- "ct/*.sh" - "ct/*.sh"
- "install/*.sh" - "install/*.sh"
- "json/*.json" - "json/*.json"
- ".github/workflows/validate-filenames.yml"
jobs: jobs:
check-files: check-files:
name: Check changed files name: Check changed files
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
pull-requests: write
steps: steps:
- name: Get pull request information
if: github.event_name == 'pull_request_target'
uses: actions/github-script@v7
id: pr
with:
script: |
const { data: pullRequest } = await github.rest.pulls.get({
...context.repo,
pull_number: context.payload.pull_request.number,
});
return pullRequest;
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 # Ensure the full history is fetched for accurate diffing fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
- name: Get changed files - name: Get changed files
id: changed-files id: changed-files
run: | run: |
if ${{ github.event_name == 'pull_request' }}; then if ${{ github.event_name == 'pull_request_target' }}; then
echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
else else
echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
fi fi
@@ -75,7 +89,7 @@ jobs:
fi fi
- name: Post results and comment - name: Post results and comment
if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request' if: always() && steps.check-scripts.outputs.files != '' && steps.check-json.outputs.files != '' && github.event_name == 'pull_request_target'
uses: actions/github-script@v7 uses: actions/github-script@v7
with: with:
script: | script: |
+18 -6
View File
@@ -4,11 +4,10 @@ on:
push: push:
branches: branches:
- main - main
pull_request: pull_request_target:
paths: paths:
- "**/*.sh" - "**/*.sh"
- "**/*.func" - "**/*.func"
- ".github/workflows/validate-formatting.yaml"
jobs: jobs:
shfmt: shfmt:
@@ -18,16 +17,29 @@ jobs:
pull-requests: write pull-requests: write
steps: steps:
- name: Get pull request information
if: github.event_name == 'pull_request_target'
uses: actions/github-script@v7
id: pr
with:
script: |
const { data: pullRequest } = await github.rest.pulls.get({
...context.repo,
pull_number: context.payload.pull_request.number,
});
return pullRequest;
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
- name: Get changed files - name: Get changed files
id: changed-files id: changed-files
run: | run: |
if ${{ github.event_name == 'pull_request' }}; then if ${{ github.event_name == 'pull_request_target' }}; then
echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
else else
echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
fi fi
@@ -58,7 +70,7 @@ jobs:
fi fi
- name: Post comment with results - name: Post comment with results
if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request' if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request_target'
uses: actions/github-script@v7 uses: actions/github-script@v7
with: with:
script: | script: |
+18 -10
View File
@@ -3,11 +3,10 @@ on:
push: push:
branches: branches:
- main - main
pull_request: pull_request_target:
paths: paths:
- "ct/*.sh" - "ct/*.sh"
- "install/*.sh" - "install/*.sh"
- ".github/workflows/validate-scripts.yml"
jobs: jobs:
check-scripts: check-scripts:
@@ -17,20 +16,29 @@ jobs:
pull-requests: write pull-requests: write
steps: steps:
- name: Get pull request information
if: github.event_name == 'pull_request_target'
uses: actions/github-script@v7
id: pr
with:
script: |
const { data: pullRequest } = await github.rest.pulls.get({
...context.repo,
pull_number: context.payload.pull_request.number,
});
return pullRequest;
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }} fetch-depth: 0 # Ensure the full history is fetched for accurate diffing
ref: ${{ github.event_name == 'pull_request_target' && fromJSON(steps.pr.outputs.result).merge_commit_sha || '' }}
- name: Set execute permission for .sh files
run: |
chmod +x ct/*.sh
- name: Get changed files - name: Get changed files
id: changed-files id: changed-files
run: | run: |
if ${{ github.event_name == 'pull_request' }}; then if ${{ github.event_name == 'pull_request_target' }}; then
echo "files=$(git diff --name-only -r HEAD^1 HEAD | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ steps.pr.outputs.result && fromJSON(steps.pr.outputs.result).merge_commit_sha }} | xargs)" >> $GITHUB_OUTPUT
else else
echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.(sh|func)$' | xargs)" >> $GITHUB_OUTPUT
fi fi
@@ -156,7 +164,7 @@ jobs:
fi fi
- name: Post results and comment - name: Post results and comment
if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request' if: always() && steps.changed-files.outputs.files != '' && github.event_name == 'pull_request_target'
uses: actions/github-script@v7 uses: actions/github-script@v7
with: with:
script: | script: |
+14
View File
@@ -16,6 +16,19 @@ All LXC instances created using this repository come pre-installed with Midnight
> [!IMPORTANT] > [!IMPORTANT]
Do not break established syntax in this file, as it is automatically updated by a Github Workflow Do not break established syntax in this file, as it is automatically updated by a Github Workflow
## 2025-01-08
### Changed
### 🌐 Website
- update postgresql json to add post install password setup [@rdiazlugo](https://github.com/rdiazlugo) ([#1318](https://github.com/community-scripts/ProxmoxVE/pull/1318))
### 🧰 Maintenance
- fix(ci): formatting event & chmod +x [@se-bastiaan](https://github.com/se-bastiaan) ([#1335](https://github.com/community-scripts/ProxmoxVE/pull/1335))
- fix: correctly handle pull_request_target event [@se-bastiaan](https://github.com/se-bastiaan) ([#1327](https://github.com/community-scripts/ProxmoxVE/pull/1327))
## 2025-01-07 ## 2025-01-07
### Changed ### Changed
@@ -26,6 +39,7 @@ Do not break established syntax in this file, as it is automatically updated by
### 🧰 Maintenance ### 🧰 Maintenance
- fix: permissions of validate pipelines [@se-bastiaan](https://github.com/se-bastiaan) ([#1316](https://github.com/community-scripts/ProxmoxVE/pull/1316))
- Set Execution Rights for GH-Action: Validate Scripts [@MickLesk](https://github.com/MickLesk) ([#1312](https://github.com/community-scripts/ProxmoxVE/pull/1312)) - Set Execution Rights for GH-Action: Validate Scripts [@MickLesk](https://github.com/MickLesk) ([#1312](https://github.com/community-scripts/ProxmoxVE/pull/1312))
## 2025-01-06 ## 2025-01-06
+6 -1
View File
@@ -30,5 +30,10 @@
"username": null, "username": null,
"password": null "password": null
}, },
"notes": [] "notes": [
{
"text": "Set a password after installation for postgres user by running `echo \"ALTER USER postgres with encrypted password 'your_password';\" | sudo -u postgres psql`",
"type": "info"
}
]
} }