From c40871f126a5942b16b8b240d256b59e25b5e7ae Mon Sep 17 00:00:00 2001 From: Vitor K Date: Sun, 1 Aug 2021 09:43:21 -0300 Subject: [PATCH] build system: remove references to travis (#5811) --- .ci/common/travis-ci.env | 18 ---- .ci/linux-clang-format/build.sh | 2 +- .ci/linux-flatpak/build.sh | 4 - .ci/linux-flatpak/docker.sh | 39 -------- .ci/linux-flatpak/finish.sh | 9 -- .ci/linux-flatpak/generate-data.sh | 126 ------------------------ .ci/linux-flatpak/travis-ci-flatpak.env | 9 -- .ci/linux-fresh/build.sh | 2 +- .ci/linux-frozen/build.sh | 2 +- .ci/linux-mingw/build.sh | 2 +- 10 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 .ci/common/travis-ci.env delete mode 100755 .ci/linux-flatpak/build.sh delete mode 100755 .ci/linux-flatpak/docker.sh delete mode 100755 .ci/linux-flatpak/finish.sh delete mode 100644 .ci/linux-flatpak/generate-data.sh delete mode 100644 .ci/linux-flatpak/travis-ci-flatpak.env diff --git a/.ci/common/travis-ci.env b/.ci/common/travis-ci.env deleted file mode 100644 index a2c6dbefd..000000000 --- a/.ci/common/travis-ci.env +++ /dev/null @@ -1,18 +0,0 @@ -# List of environment variables to be shared with Docker containers -CI -TRAVIS -CONTINUOUS_INTEGRATION -TRAVIS_BRANCH -TRAVIS_BUILD_ID -TRAVIS_BUILD_NUMBER -TRAVIS_COMMIT -TRAVIS_COMMIT_RANGE -TRAVIS_EVENT_TYPE -TRAVIS_JOB_ID -TRAVIS_JOB_NUMBER -TRAVIS_REPO_SLUG -TRAVIS_TAG - -# citra specific flags -ENABLE_COMPATIBILITY_REPORTING -USE_DISCORD_PRESENCE diff --git a/.ci/linux-clang-format/build.sh b/.ci/linux-clang-format/build.sh index 2ab6c2f0a..d92afe146 100755 --- a/.ci/linux-clang-format/build.sh +++ b/.ci/linux-clang-format/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /citra/.travis/clang-format/docker.sh +docker run -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /citra/.ci/clang-format/docker.sh diff --git a/.ci/linux-flatpak/build.sh b/.ci/linux-flatpak/build.sh deleted file mode 100755 index 91fba01aa..000000000 --- a/.ci/linux-flatpak/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -ex -mkdir -p "$HOME/.ccache" -# Configure docker and call the script that generates application data and build scripts -docker run --env-file .travis/common/travis-ci.env --env-file .travis/linux-flatpak/travis-ci-flatpak.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache -v "$HOME/.ssh":/root/.ssh --privileged citraemu/build-environments:linux-flatpak /bin/bash -ex /citra/.travis/linux-flatpak/generate-data.sh diff --git a/.ci/linux-flatpak/docker.sh b/.ci/linux-flatpak/docker.sh deleted file mode 100755 index 922b18666..000000000 --- a/.ci/linux-flatpak/docker.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -ex - -# Converts "citra-emu/citra-nightly" to "citra-nightly" -REPO_NAME=$(echo $TRAVIS_REPO_SLUG | cut -d'/' -f 2) -CITRA_SRC_DIR="/citra" -BUILD_DIR="$CITRA_SRC_DIR/build" -REPO_DIR="$CITRA_SRC_DIR/repo" -STATE_DIR="$CITRA_SRC_DIR/.flatpak-builder" -KEYS_ARCHIVE="/tmp/keys.tar" -SSH_DIR="/upload" -SSH_KEY="/tmp/ssh.key" -GPG_KEY="/tmp/gpg.key" - -# Extract keys -openssl aes-256-cbc -K $FLATPAK_ENC_K -iv $FLATPAK_ENC_IV -in "$CITRA_SRC_DIR/keys.tar.enc" -out "$KEYS_ARCHIVE" -d -tar -C /tmp -xvf $KEYS_ARCHIVE - -# Configure SSH keys -eval "$(ssh-agent -s)" -chmod -R 600 "$HOME/.ssh" -chown -R root "$HOME/.ssh" -chmod 600 "$SSH_KEY" -ssh-add "$SSH_KEY" -echo "[$FLATPAK_SSH_HOSTNAME]:$FLATPAK_SSH_PORT,[$(dig +short $FLATPAK_SSH_HOSTNAME)]:$FLATPAK_SSH_PORT $FLATPAK_SSH_PUBLIC_KEY" > ~/.ssh/known_hosts - -# Configure GPG keys -gpg2 --import "$GPG_KEY" - -# Mount our flatpak repository -mkdir -p "$REPO_DIR" -sshfs "$FLATPAK_SSH_USER@$FLATPAK_SSH_HOSTNAME:$SSH_DIR" "$REPO_DIR" -C -p "$FLATPAK_SSH_PORT" -o IdentityFile="$SSH_KEY" - -# setup ccache location -mkdir -p "$STATE_DIR" -ln -sv /root/.ccache "$STATE_DIR/ccache" - -# Build the citra flatpak -flatpak-builder -v --jobs=4 --ccache --force-clean --state-dir="$STATE_DIR" --gpg-sign="$FLATPAK_GPG_PUBLIC_KEY" --repo="$REPO_DIR" "$BUILD_DIR" "/tmp/org.citra.$REPO_NAME.json" -flatpak build-update-repo "$REPO_DIR" -v --generate-static-deltas --gpg-sign="$FLATPAK_GPG_PUBLIC_KEY" diff --git a/.ci/linux-flatpak/finish.sh b/.ci/linux-flatpak/finish.sh deleted file mode 100755 index c9f0c0731..000000000 --- a/.ci/linux-flatpak/finish.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -ex - -CITRA_SRC_DIR="/citra" -REPO_DIR="$CITRA_SRC_DIR/repo" - -# When the script finishes, unmount the repository and delete sensitive files, -# regardless of whether the build passes or fails -umount "$REPO_DIR" -rm -rf "$REPO_DIR" "/tmp/*" diff --git a/.ci/linux-flatpak/generate-data.sh b/.ci/linux-flatpak/generate-data.sh deleted file mode 100644 index 3048badf0..000000000 --- a/.ci/linux-flatpak/generate-data.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -ex -# This script generates the appdata.xml and org.citra.$REPO_NAME.json files -# needed to define application metadata and build citra depending on what version -# of citra we're building (nightly or canary) - -# Converts "citra-emu/citra-nightly" to "citra-nightly" -REPO_NAME=$(echo $TRAVIS_REPO_SLUG | cut -d'/' -f 2) -# Converts "citra-nightly" to "Citra Nightly" -REPO_NAME_FRIENDLY=$(echo $REPO_NAME | sed -e 's/-/ /g' -e 's/\b\(.\)/\u\1/g') - -# Generate the correct appdata.xml for the version of Citra we're building -cat > /tmp/appdata.xml < - - org.citra.$REPO_NAME.desktop - $REPO_NAME_FRIENDLY - Nintendo 3DS emulator - CC0-1.0 - GPL-2.0 - -

Citra is an experimental open-source Nintendo 3DS emulator/debugger written in C++. It is written with portability in mind, with builds actively maintained for Windows, Linux and macOS.

-

Citra emulates a subset of 3DS hardware and therefore is useful for running/debugging homebrew applications, and it is also able to run many commercial games! Some of these do not run at a playable state, but we are working every day to advance the project forward. (Playable here means compatibility of at least "Okay" on our game compatibility list.)

- - https://citra-emu.org/ - https://citra-emu.org/donate/ - https://github.com/citra-emu/citra/issues - https://citra-emu.org/wiki/faq/ - https://citra-emu.org/wiki/home/ - https://raw.githubusercontent.com/citra-emu/citra-web/master/site/static/images/screenshots/01-Super%20Mario%203D%20Land.jpg - https://raw.githubusercontent.com/citra-emu/citra-web/master/site/static/images/screenshots/02-Mario%20Kart%207.jpg - https://raw.githubusercontent.com/citra-emu/citra-web/master/site/static/images/screenshots/28-The%20Legend%20of%20Zelda%20Ocarina%20of%20Time%203D.jpg - https://raw.githubusercontent.com/citra-emu/citra-web/master/site/static/images/screenshots/35-Pok%C3%A9mon%20ORAS.png - - Games - Emulator - - -EOF - -# Generate the citra flatpak manifest, appending certain variables depending on -# whether we're building nightly or canary. -cat > /tmp/org.citra.$REPO_NAME.json <> /app/share/applications/citra.desktop", - "install -Dm644 ../dist/citra.svg /app/share/icons/hicolor/scalable/apps/citra.svg", - "install -Dm644 ../dist/icon.png /app/share/icons/hicolor/512x512/apps/citra.png", - "mv /app/share/mime/packages/citra.xml /app/share/mime/packages/org.citra.$REPO_NAME.xml", - "sed 's/citra/org.citra.citra-nightly/g' -i /app/share/mime/packages/org.citra.$REPO_NAME.xml" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/citra-emu/$REPO_NAME.git", - "branch": "$TRAVIS_BRANCH", - "disable-shallow-clone": true - }, - { - "type": "file", - "path": "/tmp/appdata.xml" - } - ] - } - ] -} -EOF - -# Call the script to build citra -/bin/bash -ex /citra/.travis/linux-flatpak/docker.sh diff --git a/.ci/linux-flatpak/travis-ci-flatpak.env b/.ci/linux-flatpak/travis-ci-flatpak.env deleted file mode 100644 index 0823d91c8..000000000 --- a/.ci/linux-flatpak/travis-ci-flatpak.env +++ /dev/null @@ -1,9 +0,0 @@ -# Flatpak specific environment variables -FLATPAK_ENC_IV -FLATPAK_ENC_K -FLATPAK_GPG_PUBLIC_KEY -FLATPAK_SSH_HOSTNAME -FLATPAK_SSH_LOCATION -FLATPAK_SSH_PORT -FLATPAK_SSH_PUBLIC_KEY -FLATPAK_SSH_USER diff --git a/.ci/linux-fresh/build.sh b/.ci/linux-fresh/build.sh index 72f6f84b2..c3db025f4 100755 --- a/.ci/linux-fresh/build.sh +++ b/.ci/linux-fresh/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-fresh /bin/bash -ex /citra/.travis/linux/docker.sh +docker run -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-fresh /bin/bash -ex /citra/.ci/linux/docker.sh diff --git a/.ci/linux-frozen/build.sh b/.ci/linux-frozen/build.sh index d74f28f99..113e0fde6 100755 --- a/.ci/linux-frozen/build.sh +++ b/.ci/linux-frozen/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.travis/linux-frozen/docker.sh +docker run -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.ci/linux-frozen/docker.sh diff --git a/.ci/linux-mingw/build.sh b/.ci/linux-mingw/build.sh index d05cbb888..386bcd011 100755 --- a/.ci/linux-mingw/build.sh +++ b/.ci/linux-mingw/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex mkdir "$HOME/.ccache" || true -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-mingw /bin/bash -ex /citra/.travis/linux-mingw/docker.sh +docker run -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-mingw /bin/bash -ex /citra/.ci/linux-mingw/docker.sh