Skip to content

Commit 0c8bd06

Browse files
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents c61a497 + 951d2db commit 0c8bd06

File tree

1,312 files changed

+116755
-48018
lines changed

Some content is hidden

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

1,312 files changed

+116755
-48018
lines changed

.DS_Store

10 KB
Binary file not shown.

.github/workflows/publish_release.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,36 @@ jobs:
4848
echo "tag_exists=false" >> $GITHUB_ENV
4949
fi
5050
51+
# Get Previous Tag
52+
- name: Get Previous Tag
53+
id: previous_tag
54+
if: env.tag_exists == 'false'
55+
run: |
56+
PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
57+
echo "previous_tag=$PREV_TAG" >> $GITHUB_OUTPUT
58+
echo "Previous tag: $PREV_TAG"
59+
5160
# Generate Release Notes
5261
- name: Generate Release Notes
5362
id: changelog
5463
if: env.tag_exists == 'false'
55-
uses: mikepenz/release-changelog-builder-action@v5.0.0
64+
uses: actions/github-script@v7
65+
with:
66+
script: |
67+
const params = {
68+
owner: context.repo.owner,
69+
repo: context.repo.repo,
70+
tag_name: '${{ steps.get_version.outputs.version }}',
71+
target_commitish: context.sha
72+
};
73+
74+
const previousTag = '${{ steps.previous_tag.outputs.previous_tag }}';
75+
if (previousTag) {
76+
params.previous_tag_name = previousTag;
77+
}
78+
79+
const { data } = await github.rest.repos.generateReleaseNotes(params);
80+
core.setOutput('changelog', data.body);
5681
env:
5782
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5883

@@ -75,10 +100,6 @@ jobs:
75100
if: env.tag_exists == 'false'
76101
run: |
77102
mkdir -p src/releases
78-
zip -r src/releases/release_${{ steps.get_version.outputs.version }}.zip . \
79-
--exclude "./src/releases/*" \
80-
--exclude ".*" \
81-
--exclude ".*/**"
82103
zip -r src/releases/latest.zip . \
83104
--exclude "./src/releases/*" \
84105
--exclude ".*" \

.github/workflows/upload_dev.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ jobs:
1818
with:
1919
persist-credentials: false
2020

21+
# Create version.json with version and commit hash
22+
- name: Create version.json
23+
run: |
24+
VERSION=$(cat version_latest.txt | tr -d '[:space:]')
25+
SHORT_SHA="${GITHUB_SHA::7}"
26+
echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > version.json
27+
2128
# Create ZIP File in a New Source Directory
2229
- name: Prepare and Zip Release Files
2330
run: |

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ ExcludedTenants
1010
SendNotifications/config.json
1111
.env
1212
Output/
13+
node_modules/.yarn-integrity
14+
yarn.lock
1315

1416
# Cursor IDE
1517
.cursor/rules
18+
.claude
19+
20+
# Ignore all root PowerShell files except profile.ps1
21+
/*.ps1
22+
!/profile.ps1
23+
.DS_Store

CIPP-Permissions.json

Lines changed: 0 additions & 814 deletions
This file was deleted.

CIPPActivityFunction/function.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"name": "starter",
1212
"type": "durableClient",
1313
"direction": "in"
14+
},
15+
{
16+
"type": "queue",
17+
"direction": "out",
18+
"name": "QueueItem",
19+
"queueName": "cippqueue"
1420
}
1521
]
1622
}

0 commit comments

Comments
 (0)