From 06617a2c45d94f09df78cd3434ced2515cd21dab Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Tue, 23 Jul 2024 15:18:51 +0200
Subject: [PATCH] [ci,timezone] fix dotnet restore arguments

---
 .github/workflows/timezone-update.yml | 16 +++++++++-------
 .gitignore                            |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/timezone-update.yml b/.github/workflows/timezone-update.yml
index 05ceda9f8..d33d42efa 100644
--- a/.github/workflows/timezone-update.yml
+++ b/.github/workflows/timezone-update.yml
@@ -15,6 +15,7 @@ jobs:
 
     permissions:
       contents: write
+      pull-requests: write
       
     steps:
     - uses: actions/checkout@v4
@@ -22,24 +23,28 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
-    - name: Restore dependencies
-      run: dotnet restore
     - name: Configure CMake
       run: cmake -G"Visual Studio 17 2022" -Bbuild -Swinpr\libwinpr\timezone\utils
+    - name: Restore dependencies
+      run: dotnet restore build\tzextract.sln
     - name: Build & Install CMake
       run: cmake --build build --config Release
     - name: Update timezones
       run: build\Release\tzextract.exe winpr\libwinpr\timezone
+    - name: Format code
+      run: |
+        clang-format -i --style=file winpr/libwinpr/timezone/TimeZoneNameMap.c
+        clang-format -i --style=file winpr/libwinpr/timezone/TimeZoneNameMap.json
     - name: Create Pull Request
       id: cpr
       uses: peter-evans/create-pull-request@v6
       with:
-          token: ${{ secrets.PAT }}
           commit-message: Update timezone definitions
           committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
           signoff: false
           branch: timezone-patches
+          branch-suffix: timestamp
           delete-branch: true
           title: '[timezones] Update definitions'
           body: |
@@ -48,12 +53,9 @@ jobs:
 
             [1]: https://github.com/peter-evans/create-pull-request
           labels: |
-            report
             automated pr
           assignees: akallabeth
           reviewers: akallabeth
           team-reviewers: |
-            developers
-            qa-team
-          milestone: 1
+            FreeRDP-Admin
           draft: false
diff --git a/.gitignore b/.gitignore
index 15dc69dde..35e5b6797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 **/CMakeCache.txt
 **/CMakeFiles
+build