Skip to content

Commit

Permalink
Merge pull request #1 from AlirezaRa94/resolve-conflicts
Browse files Browse the repository at this point in the history
Update the CI
  • Loading branch information
AlirezaRa94 authored Jan 16, 2024
2 parents 3c78587 + 3d56ec8 commit a018652
Show file tree
Hide file tree
Showing 9 changed files with 852 additions and 311 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04]
os: [ubuntu-latest]
include:
- os: ubuntu-18.04
- os: ubuntu-latest
PLATFORM: Linux-x86_64
# - os: ubuntu-latest
# PLATFORM: Linux-x86_64
Expand All @@ -32,8 +32,8 @@ jobs:
shell: bash -l {0}
run: |
export NVM_VERSION=0.39.0
export NODE_VERSION=16.15.0
export NPM_VERSION=6.14.15
export NODE_VERSION=18.17.0
export NPM_VERSION=8.5.5
export NVM_DIR="$HOME/.nvm"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
echo "Setting up the variables to run nvm"
Expand All @@ -50,6 +50,7 @@ jobs:
fi
npm install -g [email protected]
npm install enketo-transformer
npm install libxslt
- name: Run the transformer script
shell: bash -l {0}
Expand All @@ -60,8 +61,8 @@ jobs:
- name: Commit
run: |
git config --global user.name 'asiripanich'
git config --global user.email '[email protected].github.com'
git config --global user.name 'GitHub Action'
git config --global user.email 'action@github.com'
git add data-json
git commit --no-verify -m 'Update data-json' || echo "No changes to commit"
git push || echo "No changes to commit"
2 changes: 1 addition & 1 deletion data-json/Maliheh-test.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data-json/add-scooter.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data-json/test-place-time-use.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data-json/timeuse-survey-form.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data-json/trip-confirm-survey-form-sydney-bike-survey.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data-json/trip-confirm-survey-form.json

Large diffs are not rendered by default.

699 changes: 699 additions & 0 deletions data-xml/test-place-time-use.xml

Large diffs are not rendered by default.

441 changes: 140 additions & 301 deletions data-xml/timeuse-survey-form.xml

Large diffs are not rendered by default.

0 comments on commit a018652

Please sign in to comment.