Skip to content

Commit

Permalink
Merge pull request #3903 from crazyserver/MOBILE-3947
Browse files Browse the repository at this point in the history
MOBILE-3947 travis: Update linux distribution to Jammy
  • Loading branch information
dpalou authored Jan 19, 2024
2 parents 23a40d8 + 64b6e26 commit f40c473
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: true
default: 'https://github.com/moodle/moodle'
pull_request:
branches: [ main, ionic7, v*.x ]
branches: [ main, v*.x ]

jobs:
behat:
Expand All @@ -30,8 +30,8 @@ jobs:
BEHAT_TAGS: ${{ github.event.inputs.behat_tags || '~@performance' }}

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Additional checkouts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
MOODLE_DOCKER_BROWSER: chrome
MOODLE_DOCKER_PHP_VERSION: '8.0'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Additional checkouts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
RELEASE_TYPE: ${{ github.event.inputs.release_type || 'final' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Install npm packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_behat_plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
if: github.repository == 'moodlehq/moodleapp' || github.repository == 'moodlemobile/moodleapp'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Install npm packages
Expand Down
28 changes: 5 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
os: linux
dist: trusty
node_js: 14
dist: jammy
node_js: 18
jdk:
- oraclejdk11
- openjdk17

git:
depth: 3
Expand All @@ -21,6 +21,7 @@ cache:
- $HOME/Library/Caches/Homebrew

before_install:
- echo -e "machine github.com\n login $GIT_TOKEN" > ~/.netrc
- nvm install
- node --version
- npm --version
Expand All @@ -37,26 +38,7 @@ jobs:
include:
- name: "Build Android"
if: env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank)
language: android
android:
components:
- tools
- platform-tools
- build-tools-29.0.3
- android-29
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
before_install:
- nvm install
- node --version
- npm --version
- nvm --version
- npm ci
- export JAVA_HOME_COPY=$JAVA_HOME
- export JAVA_HOME=/usr/lib/jvm/java-8-oracle
- yes | sdkmanager "build-tools;32.0.0"
- export JAVA_HOME=$JAVA_HOME_COPY
language: java
addons:
apt:
packages:
Expand Down

0 comments on commit f40c473

Please sign in to comment.