Skip to content

Commit

Permalink
Revert "ubuntu 20.04"
Browse files Browse the repository at this point in the history
This reverts commit 6fd0ebb.
  • Loading branch information
lucasfernog committed Oct 14, 2024
1 parent 6fd0ebb commit bd197ef
Show file tree
Hide file tree
Showing 29 changed files with 55 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"name": "Ubuntu",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-20.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
// Use ubuntu-20.04 or ubuntu-18.04 on local arm64/Apple Silicon.
"args": { "VARIANT": "ubuntu-20.04" }
// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
"args": { "VARIANT": "ubuntu-22.04" }
},

// Set *default* container specific settings.json values on container create.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:

jobs:
audit-rust:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: rust audit
Expand All @@ -31,7 +31,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

audit-js:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: audit workspace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-change-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

jobs:
changes:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
api: ${{ steps.filter.outputs.api }}
schema: ${{ steps.filter.outputs.schema }}
Expand All @@ -39,7 +39,7 @@ jobs:
- 'core/tauri-config-schema/schema.json'
api:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: changes
if: needs.changes.outputs.api == 'true'
steps:
Expand All @@ -52,7 +52,7 @@ jobs:
run: ./.scripts/ci/has-diff.sh

schema:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: changes
if: needs.changes.outputs.schema == 'true'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-license-header.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: dorny/paths-filter@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/covector-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: [pull_request]

jobs:
covector:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/covector-version-or-publish-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
}
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-20.04,
os: ubuntu-22.04,
toolchain: '1.60.0'
}
- {
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, macos-13, windows-latest]
platform: [ubuntu-22.04, macos-13, windows-latest]

steps:
- uses: actions/checkout@v4
Expand All @@ -174,7 +174,7 @@ jobs:
- name: install stable
uses: dtolnay/rust-toolchain@stable
- name: install Linux dependencies
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0 webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
yarn test
version-or-publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 65
permissions:
actions: write # required for workflow_dispatch
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/covector-version-or-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, macos-latest, windows-latest]
platform: [ubuntu-22.04, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -27,7 +27,7 @@ jobs:
with:
toolchain: stable
- name: install Linux dependencies
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
yarn test
version-or-publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 65
outputs:
change: ${{ steps.covector.outputs.change }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
setup:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:

docker:
needs: setup
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ concurrency:

jobs:
fmt:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand All @@ -44,7 +44,7 @@ jobs:
args: --all -- --check

clippy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
clippy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:

jobs:
eslint-cli:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
Expand All @@ -37,7 +37,7 @@ jobs:
run: yarn format:check

eslint-api:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
- '16'
- '18'
- '20'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Setup node
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
- '16'
- '18'
- '20'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
steps:
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
image:
- ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
- ghcr.io/napi-rs/napi-rs/nodejs:armhf-16
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
working-directory: ${{ github.workspace }}
Expand Down Expand Up @@ -363,7 +363,7 @@ jobs:
ls -la
publish:
name: Publish
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
#- build-freebsd
- test-macOS-windows-binding
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-cli-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
key: ${{ matrix.config.rust_target }}

- name: install Linux dependencies
if: matrix.config.os == 'ubuntu-20.04'
if: matrix.config.os == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
Expand All @@ -73,7 +73,7 @@ jobs:

upload:
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-cli-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, macos-latest, windows-latest]
platform: [ubuntu-22.04, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -48,7 +48,7 @@ jobs:
cache-dependency-path: tooling/cli/node/yarn.lock

- name: install Linux dependencies
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
}
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-20.04,
os: ubuntu-22.04,
toolchain: '1.60.0'
}
- {
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lint-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, macos-latest, windows-latest]
platform: [ubuntu-22.04, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -49,7 +49,7 @@ jobs:
cargo test
fmt:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand All @@ -67,7 +67,7 @@ jobs:
args: --manifest-path ./tooling/bundler/Cargo.toml --all -- --check

clippy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-updater-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, macos-latest, windows-latest]
platform: [ubuntu-22.04, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -37,7 +37,7 @@ jobs:
toolchain: stable

- name: install Linux dependencies
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
TAURI_KEY_PASSWORD:
# upload assets
- uses: actions/upload-artifact@v3
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
with:
name: linux-updater-artifacts
path: ./examples/updater/src-tauri/target/release/bundle/appimage/updater-example_*.AppImage.*
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/udeps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

jobs:
changes:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
tauri: ${{ steps.filter.outputs.tauri }}
build: ${{ steps.filter.outputs.build }}
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- 'tooling/cli/**'
setup:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: changes
if: |
needs.changes.outputs.tauri == 'true' ||
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
matrix: ${{ steps.create-matrix.outputs.matrix }}

udeps:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: setup
strategy:
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
audit:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/audit-check@v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request]

jobs:
covector:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
covector:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
format:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false

Expand Down
Loading

0 comments on commit bd197ef

Please sign in to comment.