Skip to content

Commit

Permalink
fix(translations): sync translations from transifex (v38) (#3377)
Browse files Browse the repository at this point in the history
* fix(translations): sync translations from transifex (v38)

* fix(translations): sync translations from transifex (v38)

* chore: update gh artifact actions to v4

* chore: disable e2e tests since no instance to run on

---------

Co-authored-by: Jen Jones Arnesen <jennifer@dhis2.org>
  • Loading branch information
dhis2-bot and jenniferarnesen authored Oct 30, 2024
1 parent 1a4ab39 commit 183a4f8
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 231 deletions.
102 changes: 51 additions & 51 deletions .github/workflows/dhis2-verify-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Build
run: yarn build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: app-build
path: |
Expand Down Expand Up @@ -98,55 +98,55 @@ jobs:
- name: Test
run: yarn test

e2e:
runs-on: ubuntu-latest
needs: install
if: "!contains(github.event.head_commit.message, '[skip ci]')"

strategy:
matrix:
containers: [1]

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

- uses: actions/setup-node@v1
with:
node-version: 12.x

- uses: actions/cache@v2
id: yarn-cache
with:
path: '**/node_modules'
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

- name: Install Cypress binary
run: yarn cypress install

- name: End-to-End tests
uses: cypress-io/github-action@v2
with:
record: true
parallel: true
start: ${{ env.SERVER_START_CMD }}
wait-on: ${{ env.SERVER_URL }}
wait-on-timeout: 300
cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
group: 'e2e'
tag: ${{ github.event_name }}
env:
CI: true
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
SERVER_START_CMD: 'yarn start:nobrowser'
SERVER_URL: 'http://localhost:8082'
DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }}
CYPRESS_dhis2BaseUrl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }}
CYPRESS_dhis2ApiVersion: 38
CYPRESS_networkMode: 'live'
CYPRESS_dhis2Username: 'admin'
CYPRESS_dhis2Password: 'district'
# e2e:
# runs-on: ubuntu-latest
# needs: install
# if: "!contains(github.event.head_commit.message, '[skip ci]')"

# strategy:
# matrix:
# containers: [1]

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

# - uses: actions/setup-node@v1
# with:
# node-version: 12.x

# - uses: actions/cache@v2
# id: yarn-cache
# with:
# path: '**/node_modules'
# key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

# - name: Install Cypress binary
# run: yarn cypress install

# - name: End-to-End tests
# uses: cypress-io/github-action@v2
# with:
# record: true
# parallel: true
# start: ${{ env.SERVER_START_CMD }}
# wait-on: ${{ env.SERVER_URL }}
# wait-on-timeout: 300
# cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
# group: 'e2e'
# tag: ${{ github.event_name }}
# env:
# CI: true
# CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
# SERVER_START_CMD: 'yarn start:nobrowser'
# SERVER_URL: 'http://localhost:8082'
# DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }}
# CYPRESS_dhis2BaseUrl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }}
# CYPRESS_dhis2ApiVersion: 38
# CYPRESS_networkMode: 'live'
# CYPRESS_dhis2Username: 'admin'
# CYPRESS_dhis2Password: 'district'

publish:
runs-on: ubuntu-latest
Expand All @@ -161,7 +161,7 @@ jobs:
with:
node-version: 12.x

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: app-build

Expand Down
Loading

0 comments on commit 183a4f8

Please sign in to comment.