Merge branch 'main' into philprime/added-tvos-app

Author: cleptric

.env.example

@@ -24,11 +24,15 @@ export DISCORD_BOT_TOKEN="__DISCORD_BOT_TOKEN__"
 export SENTRY_BACKEND_DSN="__SENTRY_BACKEND_DSN__"
 export SENTRY_FRONTEND_DSN="__SENTRY_BACKEND_DSN__"
 export SENTRY_POTAL_DSN="__SENTRY_POTAL_DSN__"
+export SENTRY_SHOPATO_DSN="__SENTRY_SHOPATO_DSN__"
 export SENTRY_AUTH_TOKEN="__SENTRY_AUTH_TOKEN__"
 
 export POTAL_TOKEN="__POTAL_TOKEN__"
 export POTAL_URL="__POTAL_URL__"
 
 export POTATO_CHANNEL="__POTATO_CHANNEL__"
-export POTATO_STOCKS_CHANNEL="__POTATO_STOCKS_CHANNEL__"
 export POTATO_SLACK_USER_ID="__POTATO_SLACK_USER_ID__"
+
+export SHOPIFY_SHOP_DOMAIN="SHOPIFY_SHOP_DOMAIN"
+export SHOPIFY_ADMIN_ACCESS_TOKEN="SHOPIFY_ADMIN_ACCESS_TOKEN"
+export RAILS_MASTER_KEY="RAILS_MASTER_KEY"

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -42,7 +42,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -55,6 +55,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/docker.yml

@@ -16,9 +16,9 @@ jobs:
       contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build Potal Docker image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           context: .
           file: ./docker/potal/Dockerfile
@@ -31,10 +31,25 @@ jobs:
       contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build Backend Docker image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
           context: .
           file: ./docker/backend/Dockerfile
           push: false
+
+  build-shopato:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      - name: Build Backend Docker image
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
+        with:
+          context: .
+          file: ./docker/shopato/Dockerfile
+          push: false

.github/workflows/go-ci.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: 'stable'
 
@@ -32,7 +32,7 @@ jobs:
       run: go vet .
 
     - name: Run lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v9
       with:
         working-directory: ./potal
 

.github/workflows/js-ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Run npm install
       run: npm install

.github/workflows/php-ci.yml

@@ -30,7 +30,7 @@ jobs:
           - 5432:5432
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

cloudbuild.yaml

@@ -1,4 +1,18 @@
 steps:
+- name: 'gcr.io/cloud-builders/docker'
+  id: build-shopato
+  args: [
+    'build',
+    '-f', './docker/shopato/Dockerfile',
+    '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/shopato/shopato:$COMMIT_SHA',
+    '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/shopato/shopato:latest',
+    '.',
+    ]
+  waitFor: ['-']
+- name: 'gcr.io/cloud-builders/docker'
+  id: push-shopato
+  args: [ 'push', 'us-central1-docker.pkg.dev/$PROJECT_ID/shopato/shopato:$COMMIT_SHA']
+  waitFor: ['build-shopato']
 - name: 'gcr.io/cloud-builders/docker'
   id: build-potal
   args: [
@@ -27,6 +41,18 @@ steps:
   id: push-backend
   args: [ 'push', 'us-central1-docker.pkg.dev/$PROJECT_ID/backend/backend:$COMMIT_SHA']
   waitFor: ['build-backend']
+- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
+  id: deploy-shopato
+  entrypoint: gcloud
+  args:
+  - 'run'
+  - 'deploy'
+  - 'shopato'
+  - '--image'
+  - 'us-central1-docker.pkg.dev/$PROJECT_ID/shopato/shopato:$COMMIT_SHA'
+  - '--region'
+  - 'us-central1'
+  waitFor: ['push-shopato']
 - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
   id: deploy-potal
   entrypoint: gcloud
@@ -63,6 +89,7 @@ steps:
 images:
 - 'us-central1-docker.pkg.dev/$PROJECT_ID/backend/backend:latest'
 - 'us-central1-docker.pkg.dev/$PROJECT_ID/potal/potal:latest'
+- 'us-central1-docker.pkg.dev/$PROJECT_ID/shopato/shopato:latest'
 artifacts:
   objects:
     location: gs://gib-potato-assets/

composer.json

@@ -12,20 +12,20 @@
     ],
     "require": {
         "php": ">=8.4",
-        "cakephp/authentication": "^3.2.2",
-        "cakephp/cakephp": "^5.2.0",
-        "cakephp/migrations": "^4.6.2",
+        "cakephp/authentication": "^3.3.2",
+        "cakephp/cakephp": "^5.2.9",
+        "cakephp/migrations": "^4.8.2",
         "cakephp/plugin-installer": "^2.0.1",
-        "lcobucci/jwt": "^5.5.0",
+        "lcobucci/jwt": "^5.6.0",
         "paragonie/csp-builder": "^3.0.2",
-        "sentry/sentry": "^4.10.0",
-        "sentry/sentry-agent": "dev-main"
+        "sentry/sentry": "^4.17.0",
+        "sentry/sentry-agent": "^0.1.1"
     },
     "require-dev": {
-        "cakephp/bake": "^3.3.0",
-        "cakephp/cakephp-codesniffer": "^5.2.0",
-        "phpstan/phpstan": "^1.12.23",
-        "phpunit/phpunit": "^10.5.45"
+        "cakephp/bake": "^3.5.0",
+        "cakephp/cakephp-codesniffer": "^5.3.0",
+        "phpstan/phpstan": "^1.12.32",
+        "phpunit/phpunit": "^10.5.54"
     },
     "repositories": [
         {