Merge pull request #881 from mountaindude/873

.
ptarmiganlabs · Dec 3, 2023 · 0d783cd · 0d783cd
2 parents 4112f42 + 00f43f7
commit 0d783cd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -170,7 +170,7 @@ jobs:
 
           # Notarize release binary
           # Include following directories & files in the created zip file, in the ./config directory.
-          # - ./src/config/log4net_xml
+          # - ./src/config/log_appender_xml
           # - ./src/config/email_templates
           # - ./src/config/slack_templates
           # - ./src/config/teams_templates
@@ -182,7 +182,7 @@ jobs:
           # ditto -c -k --keepParent "./${DIST_FILE_NAME}" "./${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-macos.zip"
 
           cd src
-          zip -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-macos.zip" "./src/config/email_templates" "./src/config/slack_templates" "./src/config/teams_templates" "./src/config/production_template.yaml" "./src/config/schedule_template.yaml" "./docs/log4net_xml" -x "*.DS_Store"
+          zip -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-macos.zip" "./src/config/email_templates" "./src/config/slack_templates" "./src/config/teams_templates" "./src/config/production_template.yaml" "./src/config/schedule_template.yaml" "./docs/log_appender_xml" -x "*.DS_Store"
           cd ..
 
           # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
@@ -287,14 +287,14 @@ jobs:
           Compress-Archive @compress
 
           # Add following directories & files to the created zip file, in the ./config directory.
-          # - ./src/config/log4net_xml
+          # - ./src/config/log_appender_xml
           # - ./src/config/email_templates
           # - ./src/config/slack_templates
           # - ./src/config/teams_templates
           # - ./src/config⁄production_template.yaml
           # - ./src/config⁄schedule_template.yaml
           cd src
-          Compress-Archive -Path "./config/log4net_xml" -Update -DestinationPath "../${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-win.zip"
+          Compress-Archive -Path "./config/log_appender_xml" -Update -DestinationPath "../${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-win.zip"
           Compress-Archive -Path "./config/email_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-win.zip"
           Compress-Archive -Path "./config/slack_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-win.zip"
           Compress-Archive -Path "./config/teams_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-win.zip"
@@ -369,11 +369,20 @@ jobs:
 
       - name: Compress release binary
         run: |
+          # Compress insider's build
+          # Include following directories & files in the created archive file.
+          # - ./src/config/log_appender_xml
+          # - ./src/config/email_templates
+          # - ./src/config/slack_templates
+          # - ./src/config/teams_templates
+          # - ./src/config⁄production_template.yaml
+          # - ./src/config⁄schedule_template.yaml
+
           ls -la
           zip -9 -r "./${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-linux.zip" ${DIST_FILE_NAME} 
 
           cd src
-          zip -9 -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log4net_task-failed"
+          zip -9 -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_tag_name }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
           cd ..
 
       - name: Debug

diff --git a/.github/workflows/insiders-build.yaml b/.github/workflows/insiders-build.yaml
@@ -51,19 +51,21 @@ jobs:
               Compress-Archive @compress
 
               # Add following directories & files to the created zip file, in the ./config directory.
-              # - ./src/config/log4net_xml
+              # - ./src/config/log_appender_xml
               # - ./src/config/email_templates
               # - ./src/config/slack_templates
               # - ./src/config/teams_templates
               # - ./src/config⁄production_template.yaml
               # - ./src/config⁄schedule_template.yaml
-              cd src
-              Compress-Archive -Path "./config/log4net_xml" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
-              Compress-Archive -Path "./config/email_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
-              Compress-Archive -Path "./config/slack_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
-              Compress-Archive -Path "./config/teams_templates" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
-              Compress-Archive -Path "./config/production_template.yaml" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
-              Compress-Archive -Path "./config/schedule_template.yaml" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
+              mkdir config
+              copy ./src/config/log_appender_xml/ ./config/
+              copy ./src/config/email_templates/ ./config/
+              copy ./src/config/slack_templates/ ./config/
+              copy ./src/config/teams_templates/ ./config/
+              copy ./src/config/production_template.yaml ./config/
+              copy ./src/config/schedule_template.yaml ./config/
+
+              Compress-Archive -Path "./config" -Update -DestinationPath "../${env:DIST_FILE_NAME}--win-x64--${{ github.sha }}.zip"
               
               cd ..
               # dir
@@ -112,7 +114,7 @@ jobs:
 
               # Notarize insider binary
               # Include following directories & files in the created zip file, in the ./config directory.
-              # - ./src/config/log4net_xml
+              # - ./src/config/log_appender_xml
               # - ./src/config/email_templates
               # - ./src/config/slack_templates
               # - ./src/config/teams_templates
@@ -122,7 +124,7 @@ jobs:
               zip -r "./${DIST_FILE_NAME}--macos-x64--${{ github.sha }}.zip" "./${DIST_FILE_NAME}" -x "*.DS_Store"
 
               cd src
-              zip -u -r "../${DIST_FILE_NAME}--macos-x64--${{ github.sha }}.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log4net_xml" -x "*.DS_Store"
+              zip -u -r "../${DIST_FILE_NAME}--macos-x64--${{ github.sha }}.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml" -x "*.DS_Store"
               cd ..
 
               # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
@@ -146,7 +148,7 @@ jobs:
 
               # Compress insider's build
               # Include following directories & files in the created archive file.
-              # - ./src/config/log4net_xml
+              # - ./src/config/log_appender_xml
               # - ./src/config/email_templates
               # - ./src/config/slack_templates
               # - ./src/config/teams_templates
@@ -156,7 +158,7 @@ jobs:
               zip -9 -r "./${DIST_FILE_NAME}--linux-x64--${{ github.sha }}.zip" "${DIST_FILE_NAME}" 
               
               cd src
-              zip -9 -u -r "../${DIST_FILE_NAME}--linux-x64--${{ github.sha }}.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log4net_task-failed"
+              zip -9 -u -r "../${DIST_FILE_NAME}--linux-x64--${{ github.sha }}.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
               cd ..
               ls -la