Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/backend-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/frontend-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js 22
uses: actions/setup-node@v4
- name: Use Long-Term Support version of Node.js
uses: actions/setup-node@v6
with:
node-version: 22.x
node-version: 'lts/*'

- name: Cache node_modules
uses: actions/cache@v4
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Download Build Artifacts
uses: actions/download-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ohm.upstream-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
shell: bash
steps:
- name: Check out our repository
uses: actions/checkout@v4
uses: actions/checkout@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
ls -lR ./scripts/ohm

- name: Check out our new sacrificial branch
uses: actions/checkout@v4
uses: actions/checkout@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_test_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: "3.10"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr_test_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js 22
uses: actions/setup-node@v4
- name: Use Long-Term Support version of Node.js
uses: actions/setup-node@v6
with:
node-version: 22.x
node-version: 'lts/*'

- name: Cache node_modules
uses: actions/cache@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Use Node.js 12
uses: actions/setup-node@v1
- uses: actions/checkout@v6
- name: Use Long-Term Support version of Node.js
uses: actions/setup-node@v6
with:
node-version: '12'
node-version: 'lts/*'
- name: Yarn Install
run: |
cd frontend && yarn cache clean && yarn install
Expand Down Expand Up @@ -51,8 +51,8 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_REGION }}
SOURCE_DIR: "frontend/build"
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.7'
- name: Install aws cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- uses: actions/checkout@v6
- name: Use Node.js 20.19.0
- name: Use Long-Term Support version of Node.js
uses: actions/setup-node@v6
with:
node-version: 'lts/*'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const OSM_SERVER_URL =
export const OSM_SERVER_API_URL =
process.env.REACT_APP_OSM_SERVER_API_URL || 'https://api.openstreetmap.org';
export const ID_EDITOR_URL =
process.env.REACT_APP_ID_EDITOR_URL || 'https://www.openstreetmap.org/edit?editor=id&';
process.env.REACT_APP_ID_EDITOR_URL || 'https://www.openhistoricalmap.org/edit?editor=id&';
export const POTLATCH2_EDITOR_URL =
process.env.REACT_APP_POTLATCH2_EDITOR_URL ||
'https://www.openstreetmap.org/edit?editor=potlatch2';
Expand Down
Loading