-
Notifications
You must be signed in to change notification settings - Fork 8
vendor: import GTK3 Phosh and Rust bindings #211
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
Open
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
503ed22
Squashed 'phosh/' content from commit 62fde093
samcday 217e49a
Squashed 'libphosh-rs/' content from commit 5a356759
samcday 838f475
vendor: import Phosh GTK3 with git subtree
samcday f62d3a3
vendor: import libphosh-rs GTK3 with git subtree
samcday File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| libphosh/src/auto/** gitlab-generated | ||
| libphosh/sys/src/lib.rs gitlab-generated | ||
| libphosh/sys/tests/** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| libphosh/sys/target | ||
| target/ | ||
| subprojects/gvc/ | ||
| subprojects/libcall-ui/ | ||
| subprojects/phosh/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| stages: | ||
| - build | ||
| - test+docs | ||
| - deploy | ||
|
|
||
| image: debian:forky | ||
|
|
||
| default: | ||
| # Protect CI infra from rogue jobs | ||
| timeout: 15 minutes | ||
| # Allow jobs to be caneled on new commits | ||
| interruptible: true | ||
| # Retry on infra hickups automatically | ||
| retry: | ||
| max: 1 | ||
| when: | ||
| - 'api_failure' | ||
| - 'runner_system_failure' | ||
| - 'scheduler_failure' | ||
| - 'stuck_or_timeout_failure' | ||
|
|
||
| workflow: | ||
| rules: | ||
| - if: $CI_PIPELINE_SOURCE == 'merge_request_event' | ||
| # Don't trigger a branch pipeline if there is an open MR | ||
| - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS | ||
| when: never | ||
| - if: $CI_COMMIT_TAG | ||
| - if: $CI_COMMIT_BRANCH | ||
|
|
||
| variables: | ||
| DEPS: | | ||
| git build-essential ca-certificates meson curl rustup xmlstarlet | ||
| GIT_SUBMODULE_STRATEGY: recursive | ||
| RUST_VERSION: stable | ||
|
|
||
| .common_before_script: &common_before_script | ||
| before_script: | ||
| - apt update | ||
| - apt install -y --no-install-recommends eatmydata | ||
| - eatmydata apt install -y --no-install-recommends $DEPS | ||
| - rustup default $RUST_VERSION | ||
| - git submodule update --checkout | ||
| - meson subprojects download phosh | ||
| - if [ -n "$UPSTREAM_BRANCH" ]; then cd subprojects/phosh && git fetch origin "$UPSTREAM_BRANCH" && git checkout FETCH_HEAD && cd -; fi | ||
| - cd subprojects/phosh && eatmydata apt -y --no-install-recommends build-dep . && cd - | ||
|
|
||
| build: | ||
| stage: build | ||
| <<: *common_before_script | ||
| script: | ||
| # Build phosh | ||
| - meson setup _build | ||
| - meson compile -C _build | ||
| - meson install -C _build | ||
| # Build gir | ||
| - cd gir && cargo build && cd - | ||
| # Rebuild bindings | ||
| - make | ||
|
|
||
| build-doc: | ||
| stage: test+docs | ||
| needs: [] | ||
| variables: | ||
| GIT_SUBMODULE_STRATEGY: recursive | ||
| RUSTFLAGS: --cfg docsrs | ||
| RUST_VERSION: nightly | ||
| <<: *common_before_script | ||
| script: | ||
| - ./build-doc.sh | ||
| - mv target/doc/ docs | ||
| artifacts: | ||
| paths: | ||
| - docs | ||
|
|
||
| pages: | ||
| stage: deploy | ||
| needs: [ build-doc ] | ||
| script: | ||
| - mkdir -p public/git | ||
| - mv docs public/git/docs | ||
| artifacts: | ||
| paths: | ||
| - public | ||
| rules: | ||
| - if: $CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [submodule "gir"] | ||
| path = gir | ||
| url = https://github.com/gtk-rs/gir.git | ||
| update = none | ||
| [submodule "gir-files"] | ||
| path = gir-files | ||
| url = https://github.com/gtk-rs/gir-files.git | ||
| update = none | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The imported
girandgir-filesentries are gitlinks, but these mappings are placed inlibphosh-rs/.gitmoduleswhile the repository-level.gitmodulesis empty. Git therefore cannot resolve either mapping in a fresh checkout, and the binding regeneration command inlibphosh-rs/Makefilefails when it tries to initializegir. Register both gitlinks in the root.gitmodulesusing their full repository-relative paths.