Merge pull request #3903 from crazyserver/MOBILE-3947
MOBILE-3947 travis: Update linux distribution to Jammymain
commit
f40c473ddf
|
@ -16,7 +16,7 @@ on:
|
||||||
required: true
|
required: true
|
||||||
default: 'https://github.com/moodle/moodle'
|
default: 'https://github.com/moodle/moodle'
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ main, ionic7, v*.x ]
|
branches: [ main, v*.x ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
behat:
|
behat:
|
||||||
|
@ -30,8 +30,8 @@ jobs:
|
||||||
BEHAT_TAGS: ${{ github.event.inputs.behat_tags || '~@performance' }}
|
BEHAT_TAGS: ${{ github.event.inputs.behat_tags || '~@performance' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
- name: Additional checkouts
|
- name: Additional checkouts
|
||||||
|
|
|
@ -10,7 +10,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
|
@ -10,7 +10,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
|
@ -10,8 +10,8 @@ jobs:
|
||||||
MOODLE_DOCKER_BROWSER: chrome
|
MOODLE_DOCKER_BROWSER: chrome
|
||||||
MOODLE_DOCKER_PHP_VERSION: '8.0'
|
MOODLE_DOCKER_PHP_VERSION: '8.0'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
- name: Additional checkouts
|
- name: Additional checkouts
|
||||||
|
|
|
@ -19,11 +19,11 @@ jobs:
|
||||||
RELEASE_TYPE: ${{ github.event.inputs.release_type || 'final' }}
|
RELEASE_TYPE: ${{ github.event.inputs.release_type || 'final' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
- name: Install npm packages
|
- name: Install npm packages
|
||||||
|
|
|
@ -7,8 +7,8 @@ jobs:
|
||||||
if: github.repository == 'moodlehq/moodleapp' || github.repository == 'moodlemobile/moodleapp'
|
if: github.repository == 'moodlehq/moodleapp' || github.repository == 'moodlemobile/moodleapp'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version-file: '.nvmrc'
|
node-version-file: '.nvmrc'
|
||||||
- name: Install npm packages
|
- name: Install npm packages
|
||||||
|
|
28
.travis.yml
28
.travis.yml
|
@ -1,8 +1,8 @@
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: jammy
|
||||||
node_js: 14
|
node_js: 18
|
||||||
jdk:
|
jdk:
|
||||||
- oraclejdk11
|
- openjdk17
|
||||||
|
|
||||||
git:
|
git:
|
||||||
depth: 3
|
depth: 3
|
||||||
|
@ -21,6 +21,7 @@ cache:
|
||||||
- $HOME/Library/Caches/Homebrew
|
- $HOME/Library/Caches/Homebrew
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
- echo -e "machine github.com\n login $GIT_TOKEN" > ~/.netrc
|
||||||
- nvm install
|
- nvm install
|
||||||
- node --version
|
- node --version
|
||||||
- npm --version
|
- npm --version
|
||||||
|
@ -37,26 +38,7 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- name: "Build Android"
|
- name: "Build Android"
|
||||||
if: env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank)
|
if: env(DEPLOY) = 1 OR (env(DEPLOY) = 2 AND tag IS NOT blank)
|
||||||
language: android
|
language: java
|
||||||
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
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
|
|
Loading…
Reference in New Issue