Attempting to fix RSS generation

CommandPost · Jul 18, 2023 · b7a9be4 · b7a9be4
1 parent f24664f
commit b7a9be4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 943 deletions.
diff --git a/.github/scripts/generate-rss.js b/.github/scripts/generate-rss.js
@@ -28,8 +28,8 @@ function entriesAreEqual(entry1, entry2) {
 
 let oldFeedItems = [];
 
-if (fs.existsSync('docs/rss.xml')) {
-    const rssContent = fs.readFileSync('docs/rss.xml');
+if (fs.existsSync('rss.xml')) {
+    const rssContent = fs.readFileSync('rss.xml');
     const $ = cheerio.load(rssContent, { xmlMode: true });
     $('item').each((i, elem) => {
         oldFeedItems.push({
@@ -134,5 +134,5 @@ if (isContentChanged) {
     newXMLContent = newXMLContent.replace(/<lastBuildDate>.*<\/lastBuildDate>/, `<lastBuildDate>${newLastBuildDate}</lastBuildDate>`);
     newXMLContent = newXMLContent.replace(/{target=&quot;_blank&quot;}/g, '');
     newXMLContent = newXMLContent.replace(/\.\.\/static\//g, 'https://fcp.cafe/static/');
-    fs.writeFileSync('docs/rss.xml', newXMLContent);
+    fs.writeFileSync('rss.xml', newXMLContent);
 }
diff --git a/.github/workflows/retype-action.yml b/.github/workflows/retype-action.yml
@@ -118,6 +118,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Switch to retype branch and pull the latest
+        run: |
+          git checkout retype
+          git pull origin retype
+
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -131,18 +136,10 @@ jobs:
 
       - name: Commit and push if it's necessary
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git stash
-          git pull --rebase origin main
-          git stash pop
-          if git diff --exit-code --quiet docs/rss.xml; then
-            echo "No changes to commit"
-          else
-            git add docs/rss.xml
-            git commit -m "Update rss.xml"
-            git push
-          fi
+          git reset --hard
+          git clean -fd
+          git checkout retype
+          git pull origin retype
 
   publish:
     name: Publish to retype branch
@@ -162,10 +159,6 @@ jobs:
           name: docs
           path: docs/
 
-      - name: Copy rss.xml to a temporary location
-        run: |
-          cp docs/rss.xml /tmp/rss.xml
-
       - name: Build and publish using Retype
         uses: retypeapp/action-build@latest
         with:
@@ -187,9 +180,9 @@ jobs:
           git config --local user.name "GitHub Action"
           git pull origin retype
 
-      - name: Copy rss.xml from the temporary location to retype branch
+      - name: Move rss.xml to retype branch
         run: |
-          cp /tmp/rss.xml ./rss.xml
+          mv docs/rss.xml ./rss.xml
 
       - name: Commit and push if it's necessary
         run: |