Skip to content

Commit

Permalink
Merge pull request #384 from fmasa/fix-node
Browse files Browse the repository at this point in the history
Fix Node version <-> Github Actions incompatibility
  • Loading branch information
fmasa authored Dec 31, 2024
2 parents 92002f8 + 0931940 commit 814a76e
Show file tree
Hide file tree
Showing 3 changed files with 3,105 additions and 2,087 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
firestore-tests:
name: Test Firestore rules
runs-on: ubuntu-22.04
container: timbru31/java-node:11-jdk-erbium
container: timbru31/java-node:21-jdk-iron
steps:
- uses: actions/checkout@v2
- name: Get yarn cache directory path
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag'
needs: [checks-passed]
runs-on: ubuntu-22.04
container: timbru31/java-node:11-jdk-erbium
container: timbru31/java-node:21-jdk-iron
environment: production
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
Expand All @@ -177,7 +177,7 @@ jobs:
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag'
needs: [checks-passed]
runs-on: ubuntu-22.04
container: timbru31/java-node:11-jdk-erbium
container: timbru31/java-node:21-jdk-iron
environment: production
steps:
- uses: actions/checkout@v2
Expand All @@ -198,4 +198,4 @@ jobs:
uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS_BASE64 }}
- run: yarn fireway migrate --path firebase-build/migrations
- run: yarn fireway migrate --path firebase-build/migrations
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "@fmasa/dnd",
"version": "1.0.0",
"scripts": {
"test": "yarn firebase emulators:exec --only firestore 'mocha --timeout=10000 firebase/tests/**/*.ts'"
"test": "NODE_OPTIONS=--dns-result-order=ipv4first yarn firebase emulators:exec --only firestore 'mocha --timeout=10000 firebase/tests/**/*.ts'"
},
"devDependencies": {
"@firebase/testing": "^0.15.1",
"@firebase/testing": "^0.20.11",
"@types/mocha": "^7.0.2",
"firebase-admin": "^9.0.0",
"fireway": "^0.2.3",
Expand Down
Loading

0 comments on commit 814a76e

Please sign in to comment.