Merge pull request #18 from cooljeanius/master

Pull from master again (decided not to squash after all)
cooljeanius · Jul 8, 2024 · a98e3d3 · a98e3d3
2 parents 28faacf + f7af560
commit a98e3d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,5 @@
 github: cooljeanius
 ko_fi: ericgallager
+liberapay: egallager
 open_collective: cooljeanius
 patreon: EricGallager
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,10 +16,12 @@ on:
   push:
     branches:
       - master
+      - main
       - dependabot/*
   pull_request:
     branches:
       - master
+      - main
       - dependabot/*
   schedule:
     - cron: '15 22 * * 6'

diff --git a/.github/workflows/osxbom.yml b/.github/workflows/osxbom.yml
@@ -16,12 +16,12 @@ jobs:
 #     # 'compiler' was not transformed because there is no suitable equivalent in GitHub Actions
     - run: "./configure CC=${{ matrix.compiler }} && make && make check && make distcheck"
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4.3.3
+      uses: actions/upload-artifact@v4.3.4
       with:
         name: osxbom-gzipped_tarfile-${{ matrix.compiler }}-${{ matrix.os }}
         path: osxbom-0.0.*.tar.gz
     - name: Upload another Build Artifact
-      uses: actions/upload-artifact@v4.3.3
+      uses: actions/upload-artifact@v4.3.4
       with:
         name: osxbom-zipfile-${{ matrix.compiler }}-${{ matrix.os }}
         path: osxbom-0.0.*.zip