Résolution du conflit - conservation de la version locale

Author: DavidKRK

.bundle/config

@@ -1,3 +1,3 @@
 ---
-BUNDLE_PATH: "vendor/bundle"
-BUNDLE_BIN: "vendor/bundle/bin"
+BUNDLE_PATH: "/opt/build/cache/bundle"
+BUNDLE_BIN: "/opt/build/cache/binstubs"

.github/workflows/deploy.yml

@@ -0,0 +1,55 @@
+name: Deploy David KRK Site
+
+on:
+  push:
+    branches: [main, gh-pages]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+      
+      - name: Install dependencies
+        run: npm ci --prefer-offline --no-audit
+      
+      - name: Build optimized assets
+        run: npm run build
+      
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: '.'
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1 +1,4 @@
-node_modules
+node_modules
+# Local Netlify folder
+.netlify
+E

Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
     bigdecimal (3.3.1)
     colorator (1.1.0)
@@ -24,31 +24,31 @@ GEM
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
     forwardable-extended (2.6.0)
-    google-protobuf (4.33.1)
+    google-protobuf (4.32.1)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-aarch64-linux-gnu)
+    google-protobuf (4.32.1-aarch64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-aarch64-linux-musl)
+    google-protobuf (4.32.1-aarch64-linux-musl)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-arm64-darwin)
+    google-protobuf (4.32.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86-linux-gnu)
+    google-protobuf (4.32.1-x86-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86-linux-musl)
+    google-protobuf (4.32.1-x86-linux-musl)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-darwin)
+    google-protobuf (4.32.1-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-linux-gnu)
+    google-protobuf (4.32.1-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-linux-musl)
+    google-protobuf (4.32.1-x86_64-linux-musl)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
@@ -77,7 +77,7 @@ GEM
       sass-embedded (~> 1.75)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.17.0)
+    json (2.15.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -89,49 +89,49 @@ GEM
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (7.0.0)
-    rake (13.3.1)
+    public_suffix (6.0.2)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.4.4)
     rouge (4.6.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.94.2)
+    sass-embedded (1.93.2)
       google-protobuf (~> 4.31)
       rake (>= 13)
-    sass-embedded (1.94.2-aarch64-linux-android)
+    sass-embedded (1.93.2-aarch64-linux-android)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-aarch64-linux-gnu)
+    sass-embedded (1.93.2-aarch64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-aarch64-linux-musl)
+    sass-embedded (1.93.2-aarch64-linux-musl)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm-linux-androideabi)
+    sass-embedded (1.93.2-arm-linux-androideabi)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm-linux-gnueabihf)
+    sass-embedded (1.93.2-arm-linux-gnueabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm-linux-musleabihf)
+    sass-embedded (1.93.2-arm-linux-musleabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm64-darwin)
+    sass-embedded (1.93.2-arm64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-riscv64-linux-android)
+    sass-embedded (1.93.2-riscv64-linux-android)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-riscv64-linux-gnu)
+    sass-embedded (1.93.2-riscv64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-riscv64-linux-musl)
+    sass-embedded (1.93.2-riscv64-linux-musl)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-darwin)
+    sass-embedded (1.93.2-x86_64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-linux-android)
+    sass-embedded (1.93.2-x86_64-linux-android)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-linux-gnu)
+    sass-embedded (1.93.2-x86_64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-linux-musl)
+    sass-embedded (1.93.2-x86_64-linux-musl)
       google-protobuf (~> 4.31)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
-    webrick (1.9.2)
+    webrick (1.9.1)
 
 PLATFORMS
   aarch64-linux-android