Removed archlinux from build (it doesn't work anymore

This commit is contained in:
veeso
2021-02-28 16:01:07 +01:00
parent 7817295d8e
commit d165b699f0
3 changed files with 28 additions and 16 deletions

View File

@@ -9,6 +9,7 @@ Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in
- [Developer contributions guide](#developer-contributions-guide) - [Developer contributions guide](#developer-contributions-guide)
- [How TermSCP works](#how-termscp-works) - [How TermSCP works](#how-termscp-works)
- [Activities](#activities) - [Activities](#activities)
- [Tests fails due to receivers](#tests-fails-due-to-receivers)
- [Implementing File Transfers](#implementing-file-transfers) - [Implementing File Transfers](#implementing-file-transfers)
--- ---
@@ -65,6 +66,12 @@ This trait provides only 3 methods:
--- ---
### Tests fails due to receivers
Yes. This happens quite often and is related to the fact that I'm using public SSH/SFTP/FTP server to test file receivers and sometimes this server go down for even a day or more. If your tests don't pass due to this, don't worry, submit the pull request and I'll take care of testing them by myself.
---
### Implementing File Transfers ### Implementing File Transfers
This chapter describes how to implement a file transfer in TermSCP. A file transfer is a module which implements the `FileTransfer` trait. The file transfer provides different modules to interact with a remote server, which in addition to the most obvious methods, used to download and upload files, provides also methods to list files, delete files, create directories etc. This chapter describes how to implement a file transfer in TermSCP. A file transfer is a module which implements the `FileTransfer` trait. The file transfer provides different modules to interact with a remote server, which in addition to the most obvious methods, used to download and upload files, provides also methods to list files, delete files, create directories etc.

27
dist/build/deploy.sh vendored
View File

@@ -7,6 +7,8 @@ fi
VERSION=$1 VERSION=$1
set -e # Don't fail
# Create pkgs directory # Create pkgs directory
cd .. cd ..
PKGS_DIR=$(pwd)/pkgs PKGS_DIR=$(pwd)/pkgs
@@ -27,16 +29,19 @@ mkdir -p ${PKGS_DIR}/rpm/
CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7) CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7)
docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.x86_64.rpm ${PKGS_DIR}/rpm/ docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.x86_64.rpm ${PKGS_DIR}/rpm/
# Build x86_64_archlinux # Build x86_64_archlinux
cd x86_64_archlinux/
docker build --tag termscp-${VERSION}-x86_64_archlinux . ##################### TEMP REMOVED ###################################
# Create container and get AUR pkg # cd x86_64_archlinux/
cd - # docker build --tag termscp-${VERSION}-x86_64_archlinux .
mkdir -p ${PKGS_DIR}/arch/ # # Create container and get AUR pkg
CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_archlinux termscp-${VERSION}-x86_64_archlinux) # cd -
docker cp ${CONTAINER_NAME}:/usr/src/termscp/termscp-${VERSION}-x86_64.tar.gz ${PKGS_DIR}/arch/ # mkdir -p ${PKGS_DIR}/arch/
docker cp ${CONTAINER_NAME}:/usr/src/termscp/PKGBUILD ${PKGS_DIR}/arch/ # CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_archlinux termscp-${VERSION}-x86_64_archlinux)
docker cp ${CONTAINER_NAME}:/usr/src/termscp/.SRCINFO ${PKGS_DIR}/arch/ # docker cp ${CONTAINER_NAME}:/usr/src/termscp/termscp-${VERSION}-x86_64.tar.gz ${PKGS_DIR}/arch/
# Replace termscp-bin with termscp in PKGBUILD # docker cp ${CONTAINER_NAME}:/usr/src/termscp/PKGBUILD ${PKGS_DIR}/arch/
sed -i 's/termscp-bin/termscp/g' ${PKGS_DIR}/arch/PKGBUILD # docker cp ${CONTAINER_NAME}:/usr/src/termscp/.SRCINFO ${PKGS_DIR}/arch/
# # Replace termscp-bin with termscp in PKGBUILD
# sed -i 's/termscp-bin/termscp/g' ${PKGS_DIR}/arch/PKGBUILD
##################### TEMP REMOVED ###################################
exit $? exit $?

View File

@@ -1,4 +1,4 @@
FROM archlinux/archlinux:base-20210110.0.13332 as builder FROM archlinux:base-20210120.0.13969 as builder
WORKDIR /usr/src/ WORKDIR /usr/src/
# Install dependencies # Install dependencies
@@ -8,15 +8,15 @@ RUN pacman -Syu --noconfirm \
openssl \ openssl \
pkg-config \ pkg-config \
sudo sudo
# Install rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \
chmod +x /tmp/rust.sh && \
/tmp/rust.sh -y
# Create build user # Create build user
RUN useradd build -m && \ RUN useradd build -m && \
passwd -d build && \ passwd -d build && \
mkdir -p termscp && \ mkdir -p termscp && \
chown -R build.build termscp/ chown -R build.build termscp/
# Install rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust.sh && \
chmod +x ./rust.sh && \
./rust.sh -y
# Clone repository # Clone repository
RUN git clone https://github.com/veeso/termscp.git RUN git clone https://github.com/veeso/termscp.git
# Set workdir to termscp # Set workdir to termscp