Merge branch 'refs/heads/master' into test_changelog

# Conflicts: # .github/workflows/update_changelog.yml
space-sunrise · Jun 12, 2024 · 014aabb · 014aabb
2 parents 4521fa2 + 195b8f2
commit 014aabb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml
@@ -13,18 +13,18 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-
+    
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
-
+  
       - name: Install Dependencies
         run: pip install pyyaml
-
+  
       - name: Extract Changelog from PR
         run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml"
-
+  
       - name: Commit and Push Changes
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
@@ -16,3 +16,4 @@
   roles:
   - CentCommOperator
   primary: false
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@
		roles:
		- CentCommOperator
		primary: false