Merge ae736f3 into 48c913c

duckduckgo · Oct 17, 2024 · c4bd308 · c4bd308
2 parents 48c913c + ae736f3
commit c4bd308
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -9,7 +9,7 @@ permissions: write-all
 jobs:
   build:
     if: github.event.action != 'closed'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,10 @@ jobs:
 
       - name: Fetch files and checkout
         run: |
-          git fetch --all
-          git checkout releases
-          git checkout main .
+          git fetch origin
+          git checkout -b main origin/main
+          git checkout -b releases origin/releases
+          git checkout main -- .
 
       - name: Build release
         run: |
@@ -44,14 +45,19 @@ jobs:
 
       - name: Collect commit ranges
         run: |
-          bash ./scripts/changelog.sh > ${{ github.workspace }}-CHANGELOG.txt
+          bash ./scripts/changelog.sh > ${{ github.workspace }}/CHANGELOG.txt
 
+      - name: Debug changelog file
+        run: |
+          ls -la ${{ github.workspace }}/CHANGELOG.txt
+          cat ${{ github.workspace }}/CHANGELOG.txt
+    
       - name: Create Release
         uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          body_path: ${{ github.workspace }}-CHANGELOG.txt
+          body_path: ${{ github.workspace }}/CHANGELOG.txt
           draft: false
           prerelease: false
           tag_name: ${{ github.event.inputs.version }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-latest ]
+        os: [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 20
@@ -37,7 +37,7 @@ jobs:
       - name: "Clean tree"
         run: "npm run test-clean-tree"
   integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
     - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
       run: npm run docs
 
   deploy-docs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: integration
     if: ${{ github.ref == 'refs/heads/main' }}
     environment:

diff --git a/injected/scripts/entry-points.js b/injected/scripts/entry-points.js
@@ -18,7 +18,7 @@ const contentScopeName = 'contentScopeFeatures'
 const builds = {
     firefox: {
         input: 'entry-points/mozilla.js',
-        output: ['../build/firefox/entry-points.js']
+        output: ['../build/firefox/inject.js']
     },
     apple: {
         input: 'entry-points/apple.js',
@@ -47,11 +47,11 @@ const builds = {
     },
     'chrome-mv3': {
         input: 'entry-points/chrome-mv3.js',
-        output: ['../build/chrome-mv3/entry-points.js']
+        output: ['../build/chrome-mv3/inject.js']
     },
     chrome: {
         input: 'entry-points/chrome.js',
-        output: ['../build/chrome/entry-points.js']
+        output: ['../build/chrome/inject.js']
     }
 }
 

diff --git a/injected/unit-test/verify-artifacts.js b/injected/unit-test/verify-artifacts.js
@@ -23,22 +23,22 @@ const checks = {
         ]
     },
     chrome: {
-        file: join(BUILD, 'chrome/entry-points.js'),
+        file: join(BUILD, 'chrome/inject.js'),
         tests: [
             { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE_CHROME },
             { kind: 'containsString', text: '$TRACKER_LOOKUP$', includes: true }
         ]
     },
     'chrome-mv3': {
-        file: join(BUILD, 'chrome-mv3/entry-points.js'),
+        file: join(BUILD, 'chrome-mv3/inject.js'),
         tests: [
             { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE },
             { kind: 'containsString', text: 'cloneInto(', includes: false },
             { kind: 'containsString', text: '$TRACKER_LOOKUP$', includes: true }
         ]
     },
     firefox: {
-        file: join(BUILD, 'firefox/entry-points.js'),
+        file: join(BUILD, 'firefox/inject.js'),
         tests: [
             { kind: 'maxFileSize', value: CSS_OUTPUT_SIZE },
             { kind: 'containsString', text: 'cloneInto(', includes: true },