Skip to content

Commit

Permalink
Merge branch 'main' into 1ec5-road-rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeLonewolf authored Dec 18, 2023
2 parents 76c8190 + ddb34a6 commit 907a997
Show file tree
Hide file tree
Showing 25 changed files with 571 additions and 352 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ permissions:
checks: write
concurrency: preview-${{ github.ref }}
jobs:
deploy-preview:
build-preview:
runs-on: ubuntu-latest
steps:
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Checkout Main Branch 🛎️
uses: actions/checkout@v3
with:
Expand All @@ -38,10 +42,6 @@ jobs:
echo "EOF" >> $GITHUB_ENV
- name: Checkout PR Branch 🛎️
uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Install and Build 🔧
# TODO: when we move shieldlib to its own repo, move shieldlib docs CI also
run: |
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
mkdir -p pr
echo '${{ env.MAIN_STATS }}'
echo '${{ env.PR_STATS }}'
npm exec ts-node scripts/stats_compare '${{ env.MAIN_STATS }}' '${{ env.PR_STATS }}' > pr/stats-difference.md
npm exec tsx scripts/stats_compare '${{ env.MAIN_STATS }}' '${{ env.PR_STATS }}' > pr/stats-difference.md
- name: Save PR artifacts
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/s3-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up AWS CLI
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
5 changes: 1 addition & 4 deletions .mocharc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ extension:
spec:
- test/**/*.js
- test/**/*.spec.ts
require: ts-node/register
node-option:
- loader=ts-node/esm
- experimental-specifier-resolution=node
import: tsx
4 changes: 4 additions & 0 deletions icons/poi_fuel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 907a997

Please sign in to comment.