Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android: Set SDK/API level via version-suffxed --target triple #24

Merged
merged 3 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
CI: Drop broken template building
We don't use the template and its `wry` feature in this fork.
Remove it now that `ubuntu-latest` no longer has the necessary
packages which requires a tedious and complicated upgrade
of the `wry` "nonsense".  This is attempted upstream at:
https://togithub.com/rust-mobile/xbuild/pull/210
MarijnS95 committed Jan 9, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 2df97d7297eb8a0bef3cce2b2400b08b683eb4bf
71 changes: 0 additions & 71 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -31,74 +31,3 @@ jobs:
with:
name: ${{ matrix.host }}-x
path: bin/x${{ matrix.host == 'windows-latest' && '.exe' || '' }}

build-template:
strategy:
fail-fast: false
matrix:
host:
- ubuntu-latest
- macos-latest
- windows-latest
opt:
- debug
- release
target:
- platform: linux
arch: x64
- platform: macos
arch: x64
- platform: windows
arch: x64
- platform: android
arch: arm64
- platform: ios
arch: arm64

runs-on: ${{ matrix.host }}
needs: build
steps:
- name: install rust
uses: hecrj/setup-rust-action@v1
with:
rust-version: stable

- name: install x
uses: actions/download-artifact@v3
with:
name: ${{ matrix.host }}-x
- run: chmod +x ./x
if: ${{ matrix.host == 'ubuntu-latest' || matrix.host == 'macos-latest' }}

- name: install llvm ubuntu
if: ${{ matrix.host == 'ubuntu-latest' }}
run: sudo apt-get update && sudo apt-get install llvm

- name: install llvm macos
if: ${{ matrix.host == 'macos-latest' }}
run: |
brew install llvm
echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH

- name: install java
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11

- name: install linux dependencies
if: ${{ matrix.host == 'ubuntu-latest' }}
run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev squashfs-tools

- name: create project
run: ./x new template

# only linux can target linux as it is not clear what that even is exactly
# glibc/musl gtk/qt x11/wayland
# windows doesn't support posix symlinks so can't cross compile to macos/ios
- name: build project
if: >
!(matrix.host == 'macos-latest' && matrix.target.platform == 'linux' ||
matrix.host == 'windows-latest' && contains(fromJson('["linux", "macos", "ios"]'), matrix.target.platform))
run: ../x build --platform ${{ matrix.target.platform }} --arch ${{ matrix.target.arch }} --${{ matrix.opt }}
working-directory: template

Unchanged files with check annotations Beta

pub version: &'a Version,
}
impl<'a> Artifact<'a> {

Check failure on line 146 in mvn/src/package.rs

GitHub Actions / lint

the following explicit lifetimes could be elided: 'a
pub fn file_name(self, ext: &str) -> String {
format!(
"{}-{}-{}.{}",
}
}
impl<'a> std::fmt::Display for Artifact<'a> {

Check failure on line 166 in mvn/src/package.rs

GitHub Actions / lint

the following explicit lifetimes could be elided: 'a
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(
f,
entry: &'a ResTableEntry,
}
impl<'a> Entry<'a> {

Check failure on line 147 in apk/src/compiler/table.rs

GitHub Actions / lint

the following explicit lifetimes could be elided: 'a
pub fn id(self) -> ResTableRef {
self.id
}