From 929066721835ce9a05dd83316106a8cf59cd43d6 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Fri, 6 Feb 2026 11:39:06 -0800 Subject: [PATCH 1/2] Change config in order to pass editor list tests --- frontend/src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index e0f0cf874b..84ce57a018 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -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'; From 77945ede83959e9e3bd81fb77cdefd16388e58ed Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Fri, 6 Feb 2026 12:24:52 -0800 Subject: [PATCH 2/2] Update actions & start using node lts/* --- .github/workflows/backend-build-deploy.yml | 2 +- .github/workflows/frontend-build-deploy.yml | 10 +++++----- .github/workflows/ohm.upstream-sync.yml | 4 ++-- .github/workflows/pr_test_backend.yml | 4 ++-- .github/workflows/pr_test_frontend.yml | 8 ++++---- .github/workflows/production.yml | 12 ++++++------ .github/workflows/staging.yml | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/backend-build-deploy.yml b/.github/workflows/backend-build-deploy.yml index 87d8ca54f8..d0d86c2d14 100644 --- a/.github/workflows/backend-build-deploy.yml +++ b/.github/workflows/backend-build-deploy.yml @@ -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 diff --git a/.github/workflows/frontend-build-deploy.yml b/.github/workflows/frontend-build-deploy.yml index a770be29c3..775064742f 100644 --- a/.github/workflows/frontend-build-deploy.yml +++ b/.github/workflows/frontend-build-deploy.yml @@ -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 @@ -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 diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml index a21262082a..017a803e76 100644 --- a/.github/workflows/ohm.upstream-sync.yml +++ b/.github/workflows/ohm.upstream-sync.yml @@ -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: @@ -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: diff --git a/.github/workflows/pr_test_backend.yml b/.github/workflows/pr_test_backend.yml index acd2b6efa0..b0cad0e3a2 100644 --- a/.github/workflows/pr_test_backend.yml +++ b/.github/workflows/pr_test_backend.yml @@ -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" diff --git a/.github/workflows/pr_test_frontend.yml b/.github/workflows/pr_test_frontend.yml index f578a69643..e67d73a9b9 100644 --- a/.github/workflows/pr_test_frontend.yml +++ b/.github/workflows/pr_test_frontend.yml @@ -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 diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index c7e13579b9..ef8fa5d721 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -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 @@ -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 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index fdd3c62b64..ed445d2e77 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -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/*'