From ec836a8669c0186d854d0bd8a84d9a6e30bb8ea4 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 14:03:13 -0500 Subject: [PATCH 01/26] Revert "allow external links" This reverts commit f05b29675d17479a706ef6129fe45ddddb84b669. --- templates/Training/Safety/safetyHome.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Training/Safety/safetyHome.html.twig b/templates/Training/Safety/safetyHome.html.twig index 048fb80..03c1885 100644 --- a/templates/Training/Safety/safetyHome.html.twig +++ b/templates/Training/Safety/safetyHome.html.twig @@ -30,7 +30,7 @@
From a8d9e372a30894ced6aa12efc2a35d5d9bb3b0e9 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 14:04:07 -0500 Subject: [PATCH 02/26] Revert "add external link support and add forklift links" This reverts commit 4a5d3060aafb814a12f961a8bde6a42eea07d37b. --- config/safetyLinks.yaml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/config/safetyLinks.yaml b/config/safetyLinks.yaml index 838b5a7..8fdaa46 100644 --- a/config/safetyLinks.yaml +++ b/config/safetyLinks.yaml @@ -15,24 +15,21 @@ Cards: # - { title: 'Item Title', url: 'URL goes here'} General Safety: - - { title: 'General Safety', url: '/Training/Safety/Topics/general'} - - { title: 'Bloodborne Pathogens', url: '/Training/Safety/Topics/bloodborne'} - - { title: 'Safe Lifting (Video)', url: '/Training/Safety/Topics/safelifting'} - - { title: 'Hazard Communication (Video)', url: '/Training/Safety/Topics/hazardcommunication'} - - { title: 'Electrical Safety', url: '/Training/Safety/Topics/electrical'} - - { title: 'Hearing Protection (Video)', url: '/Training/Safety/Topics/hearing'} - - { title: 'Fall Protection', url: '/Training/Safety/Topics/fall'} + - { title: 'General Safety', url: 'general'} + - { title: 'Bloodborne Pathogens', url: 'bloodborne'} + - { title: 'Safe Lifting (Video)', url: 'safelifting'} + - { title: 'Hazard Communication (Video)', url: 'hazardcommunication'} + - { title: 'Electrical Safety', url: 'electrical'} + - { title: 'Hearing Protection (Video)', url: 'hearing'} + - { title: 'Fall Protection', url: 'fall'} Workplace Hazards: - - {title: 'Hand & Power Tools', url: '/Training/Safety/Topics/powertools'} - - {title: 'Welding safety (Video)', url: '/Training/Safety/Topics/welding'} - - {title: 'Personal Protective Equipment (PPE)', url: '/Training/Safety/Topics/ppe'} - - {title: 'Lockout Tagout (Video)', url: '/Training/Safety/Topics/tagout'} - - {title: 'Machine Guarding', url: '/Training/Safety/Topics/guarding'} - - {title: 'Crane/Hoist (Video)', url: '/Training/Safety/Topics/crane'} + - {title: 'Hand & Power Tools', url: 'powertools'} + - {title: 'Welding safety (Video)', url: 'welding'} + - {title: 'Personal Protective Equipment (PPE)', url: 'ppe'} + - {title: 'Lockout Tagout (Video)', url: 'tagout'} + - {title: 'Machine Guarding', url: 'guarding'} + - {title: 'Crane/Hoist (Video)', url: 'crane'} Planning: - - {title: 'Emergency Action Plan', url: '/Training/Safety/Topics/actionplan'} - - {title: 'Fire Prevention', url: '/Training/Safety/Topics/fireprevention'} - - {title: 'Fire Extinguisher Training', url: '/Training/Safety/Topics/extinguisher'} - Forklift: - - {title: 'Account Creation', url: 'https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp'} - - {title: 'Training', url: 'https://www.sunbeltrentals.com/training/safety/'} \ No newline at end of file + - {title: 'Emergency Action Plan', url: 'actionplan'} + - {title: 'Fire Prevention', url: 'fireprevention'} + - {title: 'Fire Extinguisher Training', url: 'extinguisher'} From 4b77e113086e375564339cc7d93bcc3b4e670e9f Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 14:08:28 -0500 Subject: [PATCH 03/26] hardcode forklift links into template --- .../Training/Safety/safetyHome.html.twig | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/templates/Training/Safety/safetyHome.html.twig b/templates/Training/Safety/safetyHome.html.twig index 03c1885..be16bef 100644 --- a/templates/Training/Safety/safetyHome.html.twig +++ b/templates/Training/Safety/safetyHome.html.twig @@ -37,11 +37,24 @@ {% endfor %} - - - - + {# Forklift Training #} +
+
+
+
+
Forklift Training
+
+
+ +
+
+
+
+ \ No newline at end of file From c6ddddc0e1f9de2f1f1b82cb828cd3e8c687fe01 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 14:55:54 -0500 Subject: [PATCH 04/26] demo runner --- .gitea/workflows/demo.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .gitea/workflows/demo.yaml diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml new file mode 100644 index 0000000..394c807 --- /dev/null +++ b/.gitea/workflows/demo.yaml @@ -0,0 +1,19 @@ +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +on: [push] + +jobs: + Explore-Gitea-Actions: + runs-on: ubuntu-latest + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" + - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file From 1ffe8975b1f4fe94ccead3f0c38d2afad4782c90 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 14:56:56 -0500 Subject: [PATCH 05/26] fix label --- .gitea/workflows/demo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml index 394c807..bae843a 100644 --- a/.gitea/workflows/demo.yaml +++ b/.gitea/workflows/demo.yaml @@ -4,7 +4,7 @@ on: [push] jobs: Explore-Gitea-Actions: - runs-on: ubuntu-latest + runs-on: intranet steps: - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" From 5d69219d7106e27d3fd6ce49ae5db6417d8c8aaa Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:10:42 -0500 Subject: [PATCH 06/26] testing repo pull --- .gitea/workflows/production-deploy.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitea/workflows/production-deploy.yaml diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml new file mode 100644 index 0000000..8579bc0 --- /dev/null +++ b/.gitea/workflows/production-deploy.yaml @@ -0,0 +1,17 @@ +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +on: + push: + branches: [ $default-branch ] + +jobs: + Deploy: + runs-on: intranet + steps: + - run: echo "Pulling latest production code to C:\Symfony" + - name: Check out repository code + uses: actions/checkout@v4 + - name: Copy files to project dir + run: | + mkdir C:\SymfonyRunner + xcopy /E /I . C:\SymfonyRunner \ No newline at end of file From 3b98d508e781066530c2f369dcb54b06851ad7aa Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:12:29 -0500 Subject: [PATCH 07/26] remove demo --- .gitea/workflows/demo.yaml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .gitea/workflows/demo.yaml diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml deleted file mode 100644 index bae843a..0000000 --- a/.gitea/workflows/demo.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Gitea Actions Demo -run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 -on: [push] - -jobs: - Explore-Gitea-Actions: - runs-on: intranet - steps: - - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - name: Check out repository code - uses: actions/checkout@v4 - - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." - - run: echo "🖥️ The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ gitea.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file From 6fe415f6cf99d35c33fcc0a7e7cd45cfa1ce615f Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:13:39 -0500 Subject: [PATCH 08/26] fix trigger --- .gitea/workflows/production-deploy.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 8579bc0..c203829 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -2,7 +2,8 @@ name: Gitea Actions Demo run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 on: push: - branches: [ $default-branch ] + branches: + - master jobs: Deploy: From 6647ec36aa39c29b8d4980523f7dc0b2d2345ed1 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:33:06 -0500 Subject: [PATCH 09/26] read deploy key --- .gitea/workflows/production-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index c203829..8e9aff3 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -12,6 +12,8 @@ jobs: - run: echo "Pulling latest production code to C:\Symfony" - name: Check out repository code uses: actions/checkout@v4 + with: + SSH-KEY: ${{secrets.read_key}} - name: Copy files to project dir run: | mkdir C:\SymfonyRunner From 08e7593f5da2ba99ef4a12aab5319e42933c2466 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:34:39 -0500 Subject: [PATCH 10/26] no strict ssh host --- .gitea/workflows/production-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 8e9aff3..1e3f879 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,6 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} + SSH-STRICT: 'false' - name: Copy files to project dir run: | mkdir C:\SymfonyRunner From 821a161a3a34bf75f766ba9385f6b85f2b677da0 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:51:05 -0500 Subject: [PATCH 11/26] set known hosts --- .gitea/workflows/production-deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 1e3f879..002ced0 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,7 +14,9 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-STRICT: 'false' + SSH-KNOWN-HOSTS: + - gitea.jv.com + - 192.168.0.214 - name: Copy files to project dir run: | mkdir C:\SymfonyRunner From 4027a396fe13e98c93985eb65beaa4174367acbb Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:52:32 -0500 Subject: [PATCH 12/26] set correct known hosts --- .gitea/workflows/production-deploy.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 002ced0..8d6c711 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,9 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-KNOWN-HOSTS: - - gitea.jv.com - - 192.168.0.214 + SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 - name: Copy files to project dir run: | mkdir C:\SymfonyRunner From 44cde461698881feeddf8685be962861e2e5aa78 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Tue, 13 Aug 2024 15:53:57 -0500 Subject: [PATCH 13/26] disable strict checking --- .gitea/workflows/production-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 8d6c711..7ac12ca 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -15,6 +15,7 @@ jobs: with: SSH-KEY: ${{secrets.read_key}} SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 + SSH-STRICT: 'false' - name: Copy files to project dir run: | mkdir C:\SymfonyRunner From 01f150b1ced88bd37a4fbd69688175582485bb02 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 08:17:00 -0500 Subject: [PATCH 14/26] add gitea public key to known hosts --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 7ac12ca..9953947 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 + SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214,SHA256:08SFW9e5ce8In8snszsNLhxCQseW4dQhXNHMH2z5uB8 SSH-STRICT: 'false' - name: Copy files to project dir run: | From 139e370e244b83f36d5529e0d18a2d13a58e6e47 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 08:22:12 -0500 Subject: [PATCH 15/26] correct public host key --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 9953947..0e7c723 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214,SHA256:08SFW9e5ce8In8snszsNLhxCQseW4dQhXNHMH2z5uB8 + SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214,AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFEakPj3PfGkZGEstHHMS1J+8vO/Jl7LjkFNicqtejdul668pGPelpDCfN/NmZrnUGHx5boNLJ+HNEFIStp34iYSwH8jAv8C8xEAkQEoFNNkU/yOry1Cwwi1BqeqyNcg+eK6MrpufZG3JgdOSM/BlOs+9qxbBxxY0cBQOvzovpiV7LLrQ SSH-STRICT: 'false' - name: Copy files to project dir run: | From 8b73484275ff125efc732e6a7557edc7c7c3d7e3 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 08:38:27 -0500 Subject: [PATCH 16/26] another host attempt --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 0e7c723..ed4911a 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214,AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFEakPj3PfGkZGEstHHMS1J+8vO/Jl7LjkFNicqtejdul668pGPelpDCfN/NmZrnUGHx5boNLJ+HNEFIStp34iYSwH8jAv8C8xEAkQEoFNNkU/yOry1Cwwi1BqeqyNcg+eK6MrpufZG3JgdOSM/BlOs+9qxbBxxY0cBQOvzovpiV7LLrQ + SSH-KNOWN-HOSTS: gitea.jv.com ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFEakPj3PfGkZGEstHHMS1J+8vO/Jl7LjkFNicqtejdul668pGPelpDCfN/NmZrnUGHx5boNLJ+HNEFIStp34iYSwH8jAv8C8xEAkQEoFNNkU/yOry1Cwwi1BqeqyNcg+eK6MrpufZG3JgdOSM/BlOs+9qxbBxxY0cBQOvzovpiV7LLrQ== Gitea Host Key SSH-STRICT: 'false' - name: Copy files to project dir run: | From ae4451fbb058888415084f5ddbf23e09c3a26fe8 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 08:41:47 -0500 Subject: [PATCH 17/26] nothing new --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index ed4911a..eea3b8f 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 with: SSH-KEY: ${{secrets.read_key}} - SSH-KNOWN-HOSTS: gitea.jv.com ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFEakPj3PfGkZGEstHHMS1J+8vO/Jl7LjkFNicqtejdul668pGPelpDCfN/NmZrnUGHx5boNLJ+HNEFIStp34iYSwH8jAv8C8xEAkQEoFNNkU/yOry1Cwwi1BqeqyNcg+eK6MrpufZG3JgdOSM/BlOs+9qxbBxxY0cBQOvzovpiV7LLrQ== Gitea Host Key + SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHsv90d6ofdNgJx0W6zPTVpouqDeF/qv/L0guzFBg6YON4jiubCovUZ0h7M8ipg/kXACHLfNBWAmNvsaGrPpHNU= SSH-STRICT: 'false' - name: Copy files to project dir run: | From 7698f94869129ba7695eb18fbc03741e0fe9892a Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 08:48:35 -0500 Subject: [PATCH 18/26] host key officially good --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index eea3b8f..d360002 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -7,9 +7,9 @@ on: jobs: Deploy: + name: Deploy Project files runs-on: intranet steps: - - run: echo "Pulling latest production code to C:\Symfony" - name: Check out repository code uses: actions/checkout@v4 with: From 478fa849d07ec0ed73539da5ad6587a6d091414a Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 09:37:58 -0500 Subject: [PATCH 19/26] gitea issues plugin config --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0f119a4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "gitea.owner": "audrey", + "gitea.repo": "intranet", + "gitea.instanceURL": "https://gitea.jv.com" +} \ No newline at end of file From d9398b994c12e9e24179c5a9eddc982c9452f6d2 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 09:38:03 -0500 Subject: [PATCH 20/26] completed deployment workflow --- .gitea/workflows/production-deploy.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index d360002..c905737 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -16,7 +16,19 @@ jobs: SSH-KEY: ${{secrets.read_key}} SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHsv90d6ofdNgJx0W6zPTVpouqDeF/qv/L0guzFBg6YON4jiubCovUZ0h7M8ipg/kXACHLfNBWAmNvsaGrPpHNU= SSH-STRICT: 'false' + - name: Copy files to project dir run: | - mkdir C:\SymfonyRunner - xcopy /E /I . C:\SymfonyRunner \ No newline at end of file + mkdir ${{ env.PROD_DEPLOY_DIR }} + xcopy /E /I . ${{ env.PROD_DEPLOY_DIR }} + + - name: Update Composer Packages + working-directory: ${{ env.PROD_DEPLOY_DIR }} + run: composer update + + - name: Refresh Site Cache + working-directory: ${{ env.PROD_DEPLOY_DIR }} + run: | + php bin/console cache:clear + php bin/console cache:pool:prune + php bin/console cache:warmup From d7ad9f88b7ef151c35867023f779fbe4b0d87350 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 09:43:47 -0500 Subject: [PATCH 21/26] correct var access context --- .gitea/workflows/production-deploy.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index c905737..15ab262 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -19,15 +19,15 @@ jobs: - name: Copy files to project dir run: | - mkdir ${{ env.PROD_DEPLOY_DIR }} - xcopy /E /I . ${{ env.PROD_DEPLOY_DIR }} + mkdir ${{ var.PROD_DEPLOY_DIR }} + xcopy /E /I . ${{ var.PROD_DEPLOY_DIR }} - name: Update Composer Packages - working-directory: ${{ env.PROD_DEPLOY_DIR }} + working-directory: ${{ var.PROD_DEPLOY_DIR }} run: composer update - + - name: Refresh Site Cache - working-directory: ${{ env.PROD_DEPLOY_DIR }} + working-directory: ${{ var.PROD_DEPLOY_DIR }} run: | php bin/console cache:clear php bin/console cache:pool:prune From 98af5499db2772106f73fba36d7aaa0d4319ce47 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 09:59:59 -0500 Subject: [PATCH 22/26] set composer work dir --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 15ab262..a1f5071 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -24,7 +24,7 @@ jobs: - name: Update Composer Packages working-directory: ${{ var.PROD_DEPLOY_DIR }} - run: composer update + run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }} - name: Refresh Site Cache working-directory: ${{ var.PROD_DEPLOY_DIR }} From 5ee2f09bac578262c0ddbb2dcb8e66e96c5eb3ab Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 10:01:12 -0500 Subject: [PATCH 23/26] Revert "set composer work dir" This reverts commit 98af5499db2772106f73fba36d7aaa0d4319ce47. --- .gitea/workflows/production-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index a1f5071..15ab262 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -24,7 +24,7 @@ jobs: - name: Update Composer Packages working-directory: ${{ var.PROD_DEPLOY_DIR }} - run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }} + run: composer update - name: Refresh Site Cache working-directory: ${{ var.PROD_DEPLOY_DIR }} From 9951d2ee7731d59f825516123b3da54cec35f35a Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 10:02:49 -0500 Subject: [PATCH 24/26] require symfony runtime --- composer.lock | 170 +++++++++++++++++++- config/bundles.php | 1 + config/packages/sensio_framework_extra.yaml | 3 + symfony.lock | 21 +++ 4 files changed, 187 insertions(+), 8 deletions(-) create mode 100644 config/packages/sensio_framework_extra.yaml diff --git a/composer.lock b/composer.lock index 98640fc..bf31a29 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,84 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5625360c4bf0ca4c404a3a47e7b43354", + "content-hash": "6c9cd0fccf203daf66cab2a05cf2e389", "packages": [ + { + "name": "doctrine/annotations", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^2 || ^3", + "ext-tokenizer": "*", + "php": "^7.2 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" + }, + "require-dev": { + "doctrine/cache": "^2.0", + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "symfony/cache": "^5.4 || ^6", + "vimeo/psalm": "^4.10" + }, + "suggest": { + "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/2.0.1" + }, + "time": "2023-02-02T22:02:53+00:00" + }, { "name": "doctrine/cache", "version": "2.2.0", @@ -2008,6 +2084,84 @@ }, "time": "2021-07-14T16:46:02+00:00" }, + { + "name": "sensio/framework-extra-bundle", + "version": "v6.2.10", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", + "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0|^2.0", + "php": ">=7.2.5", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/framework-bundle": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0" + }, + "conflict": { + "doctrine/doctrine-cache-bundle": "<1.3.1", + "doctrine/persistence": "<1.3" + }, + "require-dev": { + "doctrine/dbal": "^2.10|^3.0", + "doctrine/doctrine-bundle": "^1.11|^2.0", + "doctrine/orm": "^2.5", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", + "symfony/dom-crawler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/monolog-bridge": "^4.0|^5.0|^6.0", + "symfony/monolog-bundle": "^3.2", + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", + "symfony/security-bundle": "^4.4|^5.0|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "twig/twig": "^1.34|^2.4|^3.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "6.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/" + }, + "exclude-from-classmap": [ + "/tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ], + "support": { + "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" + }, + "abandoned": "Symfony", + "time": "2023-02-24T14:57:12+00:00" + }, { "name": "symfony/asset", "version": "v6.3.0", @@ -5487,16 +5641,16 @@ }, { "name": "symfony/runtime", - "version": "v6.3.1", + "version": "v6.3.12", "source": { "type": "git", "url": "https://github.com/symfony/runtime.git", - "reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d" + "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/runtime/zipball/8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d", - "reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d", + "url": "https://api.github.com/repos/symfony/runtime/zipball/a8d2b8f6033a33c224b43065a10bab5e4f0be486", + "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486", "shasum": "" }, "require": { @@ -5546,7 +5700,7 @@ "runtime" ], "support": { - "source": "https://github.com/symfony/runtime/tree/v6.3.1" + "source": "https://github.com/symfony/runtime/tree/v6.3.12" }, "funding": [ { @@ -5562,7 +5716,7 @@ "type": "tidelift" } ], - "time": "2023-06-21T12:08:28+00:00" + "time": "2024-01-23T14:35:58+00:00" }, { "name": "symfony/security-bundle", @@ -9480,5 +9634,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/config/bundles.php b/config/bundles.php index 0457f99..887a0e3 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -11,4 +11,5 @@ return [ Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], + Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], ]; diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml new file mode 100644 index 0000000..1821ccc --- /dev/null +++ b/config/packages/sensio_framework_extra.yaml @@ -0,0 +1,3 @@ +sensio_framework_extra: + router: + annotations: false diff --git a/symfony.lock b/symfony.lock index 00d2268..c2be223 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,4 +1,13 @@ { + "doctrine/annotations": { + "version": "2.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.10", + "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" + } + }, "doctrine/doctrine-bundle": { "version": "2.10", "recipe": { @@ -40,6 +49,18 @@ "tests/bootstrap.php" ] }, + "sensio/framework-extra-bundle": { + "version": "6.2", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "5.2", + "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" + }, + "files": [ + "config/packages/sensio_framework_extra.yaml" + ] + }, "symfony/console": { "version": "6.3", "recipe": { From 168dee0259951c6e93794ad95bd09b3a0932e83b Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 10:03:13 -0500 Subject: [PATCH 25/26] remove redundant cache refresh --- .gitea/workflows/production-deploy.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index 15ab262..f39e6e5 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -24,6 +24,7 @@ jobs: - name: Update Composer Packages working-directory: ${{ var.PROD_DEPLOY_DIR }} +<<<<<<< HEAD run: composer update - name: Refresh Site Cache @@ -32,3 +33,6 @@ jobs: php bin/console cache:clear php bin/console cache:pool:prune php bin/console cache:warmup +======= + run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }} +>>>>>>> d172aec (remove redundant cache refresh) From 031367fb2c87aab94da75cdd896597865b8676e3 Mon Sep 17 00:00:00 2001 From: Audrey Jensen Date: Wed, 14 Aug 2024 10:06:24 -0500 Subject: [PATCH 26/26] resolve merge issue --- .gitea/workflows/production-deploy.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.gitea/workflows/production-deploy.yaml b/.gitea/workflows/production-deploy.yaml index f39e6e5..933ac06 100644 --- a/.gitea/workflows/production-deploy.yaml +++ b/.gitea/workflows/production-deploy.yaml @@ -24,15 +24,4 @@ jobs: - name: Update Composer Packages working-directory: ${{ var.PROD_DEPLOY_DIR }} -<<<<<<< HEAD - run: composer update - - - name: Refresh Site Cache - working-directory: ${{ var.PROD_DEPLOY_DIR }} - run: | - php bin/console cache:clear - php bin/console cache:pool:prune - php bin/console cache:warmup -======= run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }} ->>>>>>> d172aec (remove redundant cache refresh)