Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ish-app/ish
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: builds/520
Choose a base ref
...
head repository: ish-app/ish
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 16, 2023

  1. Copy the full SHA
    e3ab8b4 View commit details
  2. Copy the full SHA
    a2a7f83 View commit details

Commits on Nov 17, 2023

  1. Copy the full SHA
    8b3e669 View commit details
  2. Copy the full SHA
    2db34f8 View commit details

Commits on Nov 18, 2023

  1. Copy the full SHA
    bae5808 View commit details
  2. Copy the full SHA
    ca560d9 View commit details
  3. Copy the full SHA
    ce2cb05 View commit details

Commits on Nov 19, 2023

  1. Copy the full SHA
    3f62755 View commit details
  2. Copy the full SHA
    e067951 View commit details

Commits on Nov 20, 2023

  1. Copy the full SHA
    97de956 View commit details
  2. Copy the full SHA
    d8c59e2 View commit details
  3. Update social links

    Mnpn committed Nov 20, 2023
    Copy the full SHA
    5e221e3 View commit details

Commits on Nov 21, 2023

  1. Copy the full SHA
    b50dfc4 View commit details
  2. Copy the full SHA
    1973c5d View commit details

Commits on Nov 22, 2023

  1. Copy the full SHA
    c27e1f5 View commit details
  2. Copy the full SHA
    684bce0 View commit details

Commits on Nov 25, 2023

  1. Copy the full SHA
    2cc774c View commit details
  2. Copy the full SHA
    9d373f6 View commit details

Commits on Nov 27, 2023

  1. Copy the full SHA
    7d298df View commit details
  2. Copy the full SHA
    e540490 View commit details

Commits on Nov 28, 2023

  1. Copy the full SHA
    08371b2 View commit details
  2. Copy the full SHA
    a037730 View commit details

Commits on Nov 29, 2023

  1. Copy the full SHA
    25140ab View commit details
  2. Copy the full SHA
    5651680 View commit details

Commits on Nov 30, 2023

  1. Copy the full SHA
    0493b5a View commit details
  2. Copy the full SHA
    6ba7102 View commit details

Commits on Dec 1, 2023

  1. Copy the full SHA
    58c81b4 View commit details
  2. Copy the full SHA
    b4937ef View commit details

Commits on Dec 2, 2023

  1. Copy the full SHA
    5b8d86a View commit details
  2. Copy the full SHA
    740bf3c View commit details

Commits on Dec 3, 2023

  1. Copy the full SHA
    ccd26f5 View commit details
  2. Copy the full SHA
    08ce9ea View commit details

Commits on Dec 4, 2023

  1. Copy the full SHA
    5c5de2b View commit details
  2. Copy the full SHA
    84586da View commit details

Commits on Dec 5, 2023

  1. Copy the full SHA
    3936356 View commit details
  2. Copy the full SHA
    ac9aa2f View commit details

Commits on Dec 6, 2023

  1. Copy the full SHA
    8ed4142 View commit details
  2. Copy the full SHA
    4d52c34 View commit details

Commits on Dec 8, 2023

  1. Copy the full SHA
    b84363e View commit details
  2. Copy the full SHA
    b9a94a7 View commit details

Commits on Dec 9, 2023

  1. Copy the full SHA
    6547fce View commit details

Commits on Dec 11, 2023

  1. Copy the full SHA
    c13458e View commit details
  2. Copy the full SHA
    faccead View commit details

Commits on Dec 12, 2023

  1. Copy the full SHA
    2582439 View commit details

Commits on Dec 13, 2023

  1. Copy the full SHA
    4e1938b View commit details
  2. Copy the full SHA
    4e025b2 View commit details

Commits on Dec 15, 2023

  1. Copy the full SHA
    e7ff14b View commit details

Commits on Dec 16, 2023

  1. Copy the full SHA
    8f38f79 View commit details

Commits on Dec 17, 2023

  1. Copy the full SHA
    32d34b0 View commit details
  2. Copy the full SHA
    dfca7ca View commit details
Showing with 1,842 additions and 1,851 deletions.
  1. +0 −1 .editorconfig
  2. +3 −5 .github/workflows/ci.yml
  3. +4 −2 .github/workflows/update-alpine-repo.yml
  4. +4 −7 .github/workflows/upload-build.yml
  5. +0 −136 CHANGELOG.md
  6. +8 −1 Gemfile
  7. +112 −81 Gemfile.lock
  8. +3 −3 README.md
  9. +67 −0 README_JP.md
  10. +2 −2 README_KO.md
  11. +2 −2 README_ZH.md
  12. +12 −5 app/AboutViewController.m
  13. +5 −2 app/AppDelegate.m
  14. +0 −1 app/AppStore.xcconfig
  15. +12 −0 app/Assets.xcassets/Saddam Hussein.imageset/Contents.json
  16. BIN app/Assets.xcassets/Saddam Hussein.imageset/satanusen.png
  17. +34 −15 app/Base.lproj/About.storyboard
  18. +7 −3 app/CurrentRoot.h
  19. +5 −5 app/CurrentRoot.m
  20. +1 −1 app/FileProvider/FileProviderEnumerator.m
  21. +5 −5 app/FileProvider/FileProviderExtension.m
  22. +4 −4 app/FileProvider/FileProviderItem.m
  23. +1 −1 app/Icons/Icons.plist
  24. +1 −1 app/Linux.xcconfig
  25. +2 −2 app/StaticLibLinux.xcconfig
  26. +4 −0 app/StaticLibLinuxUser.xcconfig
  27. +1 −1 app/TerminalViewController.m
  28. +6 −1 app/Theme.m
  29. +5 −3 app/UpgradeRootViewController.m
  30. +4 −0 app/UserPreferences.h
  31. +31 −3 app/UserPreferences.m
  32. +5 −4 app/gen_apk_repositories.py
  33. +1 −1 app/iSH.xcconfig
  34. +288 −0 asbestos/asbestos.c
  35. +18 −22 jit/jit.h → asbestos/asbestos.h
  36. +15 −0 asbestos/frame.h
  37. 0 {jit → asbestos}/gadgets-aarch64/bits.S
  38. +11 −11 {jit → asbestos}/gadgets-aarch64/control.S
  39. +15 −15 {jit → asbestos}/gadgets-aarch64/entry.S
  40. +1 −1 {jit → asbestos}/gadgets-aarch64/gadgets.h
  41. 0 {jit → asbestos}/gadgets-aarch64/math.S
  42. 0 {jit → asbestos}/gadgets-aarch64/math.h
  43. +1 −1 {jit → asbestos}/gadgets-aarch64/memory.S
  44. +22 −17 {jit → asbestos}/gadgets-aarch64/misc.S
  45. 0 {jit → asbestos}/gadgets-aarch64/string.S
  46. 0 {jit → asbestos}/gadgets-generic.h
  47. 0 {jit → asbestos}/gadgets-x86_64/bits.S
  48. +11 −11 {jit → asbestos}/gadgets-x86_64/control.S
  49. +15 −15 {jit → asbestos}/gadgets-x86_64/entry.S
  50. +1 −1 {jit → asbestos}/gadgets-x86_64/gadgets.h
  51. 0 {jit → asbestos}/gadgets-x86_64/math.S
  52. +1 −1 {jit → asbestos}/gadgets-x86_64/memory.S
  53. 0 {jit → asbestos}/gadgets-x86_64/misc.S
  54. 0 {jit → asbestos}/gadgets-x86_64/string.S
  55. +7 −7 {jit → asbestos}/gen.c
  56. +2 −2 {jit → asbestos}/gen.h
  57. 0 {jit → asbestos}/helpers.c
  58. +9 −9 {jit → asbestos}/offsets.c
  59. +2 −1 debug.h
  60. +1 −1 deps/aports/v3.14/main/x86/index.txt
  61. +1 −1 deps/aports/v3.17/community/x86/index.txt
  62. +1 −1 deps/aports/v3.17/main/x86/index.txt
  63. +1 −1 deps/aports/v3.18/community/x86/index.txt
  64. +1 −1 deps/aports/v3.18/main/x86/index.txt
  65. +1 −0 deps/aports/v3.19/community/x86/index.txt
  66. +1 −0 deps/aports/v3.19/main/x86/index.txt
  67. +1 −1 deps/linux
  68. +5 −10 deps/linux-build.sh
  69. +25 −6 deps/meson.build
  70. +11 −5 emu/decode.h
  71. +2 −1 emu/float80.c
  72. +1 −1 emu/fpu.c
  73. +0 −632 emu/interp.c
  74. +0 −135 emu/interp/fpu.h
  75. +3 −2 emu/mmu.h
  76. +0 −86 emu/regid.h
  77. +3 −4 fastlane/Fastfile
  78. +0 −1 fastlane/Snapfile
  79. +1 −1 fastlane/footer.txt
  80. +1 −1 fs/dyndev.h
  81. +19 −8 fs/fake-db.c
  82. +6 −3 fs/fake-db.h
  83. +23 −18 fs/fake.c
  84. +1 −1 fs/fd.h
  85. +1 −2 fs/generic.c
  86. +1 −3 fs/inode.c
  87. +11 −7 fs/lock.c
  88. +17 −6 fs/proc/ish.c
  89. +1 −1 fs/proc/pid.c
  90. +34 −4 fs/pty.c
  91. +1 −11 fs/real.c
  92. +52 −0 fs/stat.c
  93. +35 −0 fs/stat.h
  94. +11 −17 fs/tty.c
  95. +1 −0 fs/tty.h
  96. +124 −37 iSH.xcodeproj/project.pbxproj
  97. +1 −0 ish-lldb.lldb
  98. +0 −15 jit/frame.h
  99. +0 −289 jit/jit.c
  100. +6 −3 kernel/calls.c
  101. +1 −0 kernel/calls.h
  102. +22 −6 kernel/exit.c
  103. +0 −14 kernel/fs.c
  104. +2 −1 kernel/fs.h
  105. +16 −0 kernel/log.c
  106. +6 −14 {emu → kernel}/memory.c
  107. +0 −9 {emu → kernel}/memory.h
  108. +1 −1 kernel/mm.h
  109. +1 −1 kernel/mmap.c
  110. +35 −20 kernel/poll.c
  111. +1 −1 kernel/task.c
  112. +9 −1 kernel/task.h
  113. +14 −0 kernel/time.h
  114. +148 −0 linux/emu_asbestos.c
  115. +262 −0 linux/emu_unicorn.c
  116. +17 −0 linux/emu_unicorn.h
  117. +7 −0 linux/emu_unicorn_kernel.c
  118. +10 −10 linux/fakefs.c
  119. +44 −28 meson.build
  120. +1 −1 meson_options.txt
  121. +32 −8 tools/fakefs.c
  122. +12 −4 tools/meson.build
  123. +1 −1 tools/ptraceomatic.c
  124. +2 −1 tools/ptutil.c
  125. +1 −1 tools/staticdefine.sh
  126. +13 −0 util/fchdir.c
  127. +4 −0 util/fchdir.h
  128. +1 −0 util/sync.h
  129. +1 −1 util/timer.h
  130. +3 −0 xX_main_Xx.h
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -3,6 +3,5 @@ root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = false
indent_style = space
indent_size = 4
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
run: deps/clone-linux.sh
- name: Build
run: |
meson build -Dengine=jit -Dkernel=${{matrix.kernel}}
meson build -Dengine=asbestos -Dkernel=${{matrix.kernel}}
ninja -C build
env:
CC: ${{matrix.cc}}
@@ -38,7 +38,7 @@ jobs:
run: ninja -C build test

build-mac:
runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
kernel: [ish, linux]
@@ -48,9 +48,7 @@ jobs:
submodules: true
- name: Install dependencies
run: |
sudo xcode-select -s /Applications/Xcode_14.3.app
brew install llvm ninja libarchive
pip3 install meson
brew install llvm lld ninja libarchive meson
- name: Clone Linux
if: matrix.kernel == 'linux'
run: deps/clone-linux.sh
6 changes: 4 additions & 2 deletions .github/workflows/update-alpine-repo.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ name: "Update Repo"
on:
workflow_dispatch:
schedule:
- cron: "0 0 * * *"
- cron: "0 0 * * 6"

jobs:
update:
@@ -25,6 +25,8 @@ jobs:
deps/aports/sync-archive.sh v3.17 community/x86 deps/aports
deps/aports/sync-archive.sh v3.18 main/x86 deps/aports
deps/aports/sync-archive.sh v3.18 community/x86 deps/aports
deps/aports/sync-archive.sh v3.19 main/x86 deps/aports
deps/aports/sync-archive.sh v3.19 community/x86 deps/aports
- name: Commit
id: commit
run: |
@@ -36,4 +38,4 @@ jobs:
continue-on-error: true
- name: Push
if: ${{ steps.commit.outcome == 'success' }}
run: git push
run: git push
11 changes: 4 additions & 7 deletions .github/workflows/upload-build.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
jobs:
upload-build:
if: github.repository == 'ish-app/ish'
runs-on: macos-13
runs-on: macos-14
timeout-minutes: 720
steps:
- uses: actions/checkout@v2
@@ -18,9 +18,7 @@ jobs:

- name: Install deps
run: |
sudo xcode-select -s /Applications/Xcode_14.3.app
pip3 install meson
brew install ninja llvm
brew install ninja lld llvm meson
bundle install
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
@@ -38,15 +36,14 @@ jobs:
SLACK_URL: ${{ secrets.SLACK_URL }}
FASTLANE_SKIP_UPDATE_CHECK: 1

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: App
path: |
iSH.ipa
iSH.app.dSYM.zip
iSH-appstore.app.dSYM.zip
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: always()
with:
name: Fastlane Logs
136 changes: 0 additions & 136 deletions CHANGELOG.md

This file was deleted.

9 changes: 8 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
source "https://rubygems.org"
gem "fastlane", "~> 2"
gem "fastlane"
gem "dotenv"
gem "pry"

gem "abbrev"
gem "irb"
gem "rdoc"
gem "mutex_m"
gem "ostruct"
gem "logger"
Loading