Skip to content

Commit cb9e814

Browse files
authoredSep 30, 2022
Update to ubuntu-20.04 (#2256)
1 parent 20a1180 commit cb9e814

6 files changed

+13
-14
lines changed
 

‎scripts/azure-pipelines-complete.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
default:
1919
pool:
2020
name: Azure Pipelines
21-
vmImage: ubuntu-18.04
21+
vmImage: ubuntu-20.04
2222
- name: VM_IMAGE_WINDOWS
2323
type: object
2424
default:
@@ -36,11 +36,11 @@ parameters:
3636
default:
3737
pool:
3838
name: Azure Pipelines
39-
vmImage: ubuntu-18.04
39+
vmImage: ubuntu-20.04
4040

4141
pool:
4242
name: Azure Pipelines
43-
vmImage: ubuntu-18.04
43+
vmImage: ubuntu-20.04
4444

4545
variables:
4646
- template: azure-pipelines-variables.yml

‎scripts/azure-pipelines-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
default:
99
pool:
1010
name: Azure Pipelines
11-
vmImage: ubuntu-18.04
11+
vmImage: ubuntu-20.04
1212
- name: VM_IMAGE_WINDOWS
1313
type: object
1414
default:
@@ -26,7 +26,7 @@ parameters:
2626
default:
2727
pool:
2828
name: Azure Pipelines
29-
vmImage: ubuntu-18.04
29+
vmImage: ubuntu-20.04
3030

3131
variables:
3232
- template: azure-pipelines-variables.yml

‎scripts/azure-pipelines-variables.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ variables:
99
PREVIEW_LABEL: 'preview'
1010
BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)]
1111
BUILD_COUNTER: $[counter('global_counter', 1)]
12-
TIZEN_LINUX_PACKAGES: libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn
12+
TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn
1313
MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build
1414
MONO_VERSION_MACOS: '6_12_13'
15-
MONO_VERSION_LINUX: ''
15+
MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182'
1616
XCODE_VERSION: 13.2.1
1717
VISUAL_STUDIO_VERSION: '17/pre'
1818
DOTNET_VERSION_PREVIEW: '6.0.401'

‎scripts/azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
default:
1919
pool:
2020
name: Azure Pipelines
21-
vmImage: ubuntu-18.04
21+
vmImage: ubuntu-20.04
2222
- name: VM_IMAGE_WINDOWS
2323
type: object
2424
default:
@@ -36,7 +36,7 @@ parameters:
3636
default:
3737
pool:
3838
name: Azure Pipelines
39-
vmImage: ubuntu-18.04
39+
vmImage: ubuntu-20.04
4040

4141
variables:
4242
- template: azure-pipelines-variables.yml

‎scripts/azure-templates-bootstrapper.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ jobs:
8080
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne('${{ parameters.packages }}', ''))
8181
8282
# make sure mono/msbuild is the correct version
83-
- ${{ if and(ne(variables['MONO_VERSION_LINUX'], ''), eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}:
83+
- ${{ if and(eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}:
8484
- bash: ./scripts/install-mono.sh $(MONO_VERSION_LINUX)
8585
displayName: Install Mono and MSBuild
8686
retryCountOnTaskFailure: 3
87-
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
87+
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables['MONO_VERSION_LINUX'], ''))
8888
- ${{ if endsWith(parameters.name, '_macos') }}:
8989
- bash: sudo ./scripts/select-xamarin.sh $(MONO_VERSION_MACOS)
9090
displayName: Switch to the latest Xamarin SDK

‎scripts/install-mono.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
sudo apt remove -y mono-complete msbuild
5-
sudo apt autoremove -y
6-
sudo rm /etc/mono/config
74
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
85
echo "deb https://download.mono-project.com/repo/ubuntu $@ main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
96
sudo apt update
107
sudo apt install -y mono-complete msbuild
118
mono --version
9+
sudo apt install -y gtk-sharp2
10+
mono --version

0 commit comments

Comments
 (0)
Please sign in to comment.