Skip to content

Commit

Permalink
Merge pull request #9129 from scratchfoundation/hotfix/test-cwf-2025-…
Browse files Browse the repository at this point in the history
…01-08

Fix s3cmd deploy on ubuntu-latest
  • Loading branch information
cwillisf authored Jan 28, 2025
2 parents 0895ceb + 51cc73f commit 18b0994
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:

jobs:
build-and-test-and-maybe-deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
environment: >-
${{
(
Expand Down Expand Up @@ -56,10 +56,13 @@ jobs:
github.head_ref: ${{ github.head_ref }}
github.ref: ${{ github.ref }}
EOF
- name: setup
run: |
npm --production=false ci
mkdir -p ./test/results
- name: setup Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
- run: pip install s3cmd==2.4.0
- run: npm --production=false ci
- run: mkdir -p ./test/results
- name: lint
run: npm run test:lint:ci
- name: build
Expand Down Expand Up @@ -89,12 +92,6 @@ jobs:
JEST_JUNIT_OUTPUT_NAME=localization-jest-results.xml npm run test:unit:jest:localization -- --reporters=jest-junit
npm run test:unit:tap -- --output-file ./test/results/unit-raw.tap
npm run test:unit:convertReportToXunit
- name: setup Python
if: ${{ env.SCRATCH_SHOULD_DEPLOY == 'true' }}
run: |
curl https://bootstrap.pypa.io/pip/3.5/get-pip.py -o get-pip.py
python3 get-pip.py pip==21.0.1
pip install s3cmd==2.3.0
- name: deploy
if: ${{ env.SCRATCH_SHOULD_DEPLOY == 'true' }}
run: npm run deploy
Expand Down

0 comments on commit 18b0994

Please sign in to comment.