Skip to content

Commit 52a81dd

Browse files
committed
Change project namw
1 parent 75b3522 commit 52a81dd

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
path: |
2626
/tmp/x86_64-linux-gnu.tar.xz
2727
/tmp/x86_64-linux-gnu.tar.xz.sha256
28-
- name: Build Venti
28+
- name: Build dragonfly-gcc-cross
2929
if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
3030
run: |
3131
bash './build.sh' 'native'
@@ -51,7 +51,7 @@ jobs:
5151
if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
5252
run: |
5353
declare tarball_filename='/tmp/x86_64-linux-gnu.tar.xz'
54-
tar --directory='/tmp' --create --file=- 'venti' | xz --threads='0' --compress -9 > "${tarball_filename}"
54+
tar --directory='/tmp' --create --file=- 'dragonfly-gcc-cross' | xz --threads='0' --compress -9 > "${tarball_filename}"
5555
sha256sum "${tarball_filename}" | sed 's|/tmp/||' > "${tarball_filename}.sha256"
5656
- name: Upload artifact
5757
if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
@@ -132,8 +132,8 @@ jobs:
132132
- name: Setup toolchain
133133
run: |
134134
tar --directory='/tmp' --extract --file='/tmp/x86_64-linux-gnu.tar.xz'
135-
mv '/tmp/venti' '/tmp/venti-toolchain'
136-
- name: Cross-compile Venti to ${{ matrix.target }}
135+
mv '/tmp/dragonfly-gcc-cross' '/tmp/dragonfly-gcc-cross-toolchain'
136+
- name: Cross-compile dragonfly-gcc-cross to ${{ matrix.target }}
137137
run: |
138138
source './tools/setup_toolchain.sh'
139139
@@ -188,12 +188,12 @@ jobs:
188188
elif [[ '${{ matrix.target }}' = *'-dragonfly' ]]; then
189189
# declare -r VENTI_TAG='gcc-15'
190190
# declare -r VENTI_TARBALL='/tmp/toolchain.tar.xz'
191-
# declare -r VENTI_URL="https://github.com/AmanoTeam/Venti/releases/download/${VENTI_TAG}/x86_64-unknown-linux-gnu.tar.xz"
191+
# declare -r VENTI_URL="https://github.com/AmanoTeam/dragonfly-gcc-cross/releases/download/${VENTI_TAG}/x86_64-unknown-linux-gnu.tar.xz"
192192
193193
# curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${VENTI_URL}" --output "${VENTI_TARBALL}"
194194
# tar --directory="$(dirname "${VENTI_TARBALL}")" --extract --file="${VENTI_TARBALL}"
195195
196-
# export VENTI_HOME='/tmp/venti'
196+
# export VENTI_HOME='/tmp/dragonfly-gcc-cross'
197197
export PATH="${VENTI_HOME}/bin:${PATH}"
198198
199199
source "${VENTI_HOME}/build/autotools/${{ matrix.target }}.sh"
@@ -205,19 +205,19 @@ jobs:
205205
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${SIL_URL}" --output "${SIL_TARBALL}"
206206
tar --directory="$(dirname "${SIL_TARBALL}")" --extract --file="${SIL_TARBALL}"
207207
208-
export SIL_HOME='/tmp/sil'
208+
export SIL_HOME='/tmp/android-gcc-cross'
209209
export PATH="${SIL_HOME}/bin:${PATH}"
210210
211211
source "${SIL_HOME}/build/autotools/${{ matrix.target }}.sh"
212212
elif [[ '${{ matrix.target }}' = *'-android'* ]]; then
213-
declare -r PINO_TAG='gcc-15'
213+
declare -r PINO_TAG='gcc-16'
214214
declare -r PINO_TARBALL='/tmp/toolchain.tar.xz'
215-
declare -r PINO_URL="https://github.com/AmanoTeam/Pino/releases/download/${PINO_TAG}/x86_64-unknown-linux-gnu.tar.xz"
215+
declare -r PINO_URL="https://github.com/AmanoTeam/android-gcc-cross/releases/download/${PINO_TAG}/x86_64-unknown-linux-gnu.tar.xz"
216216
217217
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${PINO_URL}" --output "${PINO_TARBALL}"
218218
tar --directory="$(dirname "${PINO_TARBALL}")" --extract --file="${PINO_TARBALL}"
219219
220-
export PINO_HOME='/tmp/pino'
220+
export PINO_HOME='/tmp/android-gcc-cross'
221221
export PATH="${PINO_HOME}/bin:${PATH}"
222222
223223
source "${PINO_HOME}/build/autotools/${{ matrix.target }}.sh"
@@ -257,7 +257,7 @@ jobs:
257257
- name: Generate tarball
258258
run: |
259259
declare tarball_filename='/tmp/${{ matrix.target }}.tar.xz'
260-
tar --directory='/tmp' --create --file=- 'venti' | xz --threads='0' --compress -9 > "${tarball_filename}"
260+
tar --directory='/tmp' --create --file=- 'dragonfly-gcc-cross' | xz --threads='0' --compress -9 > "${tarball_filename}"
261261
sha256sum "${tarball_filename}" | sed 's|/tmp/||' > "${tarball_filename}.sha256"
262262
- name: Upload artifact
263263
uses: actions/upload-artifact@main

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -eu
44

5-
declare -r toolchain_directory='/tmp/venti'
6-
declare -r share_directory="${toolchain_directory}/usr/local/share/venti"
5+
declare -r toolchain_directory='/tmp/dragonfly-gcc-cross'
6+
declare -r share_directory="${toolchain_directory}/usr/local/share/dragonfly-gcc-cross"
77

88
declare -r environment="LD_LIBRARY_PATH=${toolchain_directory}/lib PATH=${PATH}:${toolchain_directory}/bin"
99

@@ -526,7 +526,7 @@ for triplet in "${targets[@]}"; do
526526

527527
cd "$(mktemp --directory)"
528528

529-
declare sysroot_url="https://github.com/AmanoTeam/Venti/releases/download/sysroot/${triplet}.tar.xz"
529+
declare sysroot_url="https://github.com/AmanoTeam/dragonfly-gcc-cross/releases/download/sysroot/${triplet}.tar.xz"
530530
declare sysroot_file="${PWD}/${triplet}.tar.xz"
531531
declare sysroot_directory="${PWD}/${triplet}"
532532

tools/setup_toolchain.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
declare -r VENTI_HOME='/tmp/venti-toolchain'
5+
declare -r VENTI_HOME='/tmp/dragonfly-gcc-cross-toolchain'
66

77
if [ -d "${VENTI_HOME}" ]; then
88
PATH+=":${VENTI_HOME}/bin"
@@ -11,16 +11,16 @@ if [ -d "${VENTI_HOME}" ]; then
1111
return 0
1212
fi
1313

14-
declare -r VENTI_CROSS_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --retry 10 --retry-delay 3 --silent --url 'https://api.github.com/repos/AmanoTeam/Venti/releases/latest')")"
15-
declare -r VENTI_CROSS_TARBALL='/tmp/venti.tar.xz'
16-
declare -r VENTI_CROSS_URL="https://github.com/AmanoTeam/Venti/releases/download/${VENTI_CROSS_TAG}/x86_64-unknown-linux-gnu.tar.xz"
14+
declare -r VENTI_CROSS_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --retry 10 --retry-delay 3 --silent --url 'https://api.github.com/repos/AmanoTeam/dragonfly-gcc-cross/releases/latest')")"
15+
declare -r VENTI_CROSS_TARBALL='/tmp/dragonfly-gcc-cross.tar.xz'
16+
declare -r VENTI_CROSS_URL="https://github.com/AmanoTeam/dragonfly-gcc-cross/releases/download/${VENTI_CROSS_TAG}/x86_64-unknown-linux-gnu.tar.xz"
1717

1818
curl --retry 10 --retry-delay 3 --silent --location --url "${VENTI_CROSS_URL}" --output "${VENTI_CROSS_TARBALL}"
1919
tar --directory="$(dirname "${VENTI_CROSS_TARBALL}")" --extract --file="${VENTI_CROSS_TARBALL}"
2020

2121
rm "${VENTI_CROSS_TARBALL}"
2222

23-
mv '/tmp/venti' "${VENTI_HOME}"
23+
mv '/tmp/dragonfly-gcc-cross' "${VENTI_HOME}"
2424

2525
PATH+=":${VENTI_HOME}/bin"
2626

0 commit comments

Comments
 (0)