From 7905105cbf2c92e845ed748193e512000f9b4f29 Mon Sep 17 00:00:00 2001 From: AtaS Date: Sun, 13 Oct 2024 19:49:31 +0100 Subject: [PATCH] Update build and publish.yml and add Swipetor.slnx --- .github/workflows/build-and-publish.yml | 24 +++++++++++++++++------- README.md | 11 ++++++++--- Swipetor.slnx | 4 ++++ 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 Swipetor.slnx diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 809497c..c62294a 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -132,11 +132,21 @@ jobs: - name: Trigger pull-deploy run: | ssh -p1989 ata@${{ secrets.PROD_HOST }} "/opt/swipetor/bin/pull-deploy/run.sh" + + + deploy: + needs: build_and_test + runs-on: ubuntu-latest + environment: main + steps: + - name: Set up SSH + run: | + mkdir -p ~/.ssh/ + ls -lha ~/.ssh + echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_ed25519 + chmod 600 ~/.ssh/id_ed25519 + ssh-keyscan -p ${{ secrets.SSH_PORT }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts -# - name: Commit bumped version -# run: | -# git config user.name "GitHub Actions" -# git config user.email "" -# git tag -a "v$next_version" -m "Release v$next_version" -# git push origin "v$next_version" -# + - name: Trigger pull-deploy + run: | + ssh -p${{ secrets.SSH_PORT }} ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "/opt/swipetor/bin/pull-deploy/run.sh" diff --git a/README.md b/README.md index f386e1b..d06ad74 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,14 @@ Server-side application for open-source Swipetor videos swiping web app. Find more information on the UI side of the project at https://github.com/atas/swipetor-ui -Visit https://www.swipetor.com for the demo. +Visit https://demo.swipetor.com for the demo. ## Dual Licensing -- **AGPL-3.0 License**: This is the default and preferred open-source license for the project. For more details, see the [AGPL-3.0 License](LICENSE). -- Different licenes: please contact at https://swipetor.com +- **AGPL-3.0 License**: Default and preferred open-source license for the project. For more details, see + the [AGPL-3.0 License](LICENSE). + - This license allows commercial use, but you should share any modifications you make to the software. Please send a + PR back for any improvements. + - This license restricts multi-tenant or multi-domain usage. +- **Dual Licensing**: Please contact at www.swipetor.com. +- \ No newline at end of file diff --git a/Swipetor.slnx b/Swipetor.slnx new file mode 100644 index 0000000..4d4e40e --- /dev/null +++ b/Swipetor.slnx @@ -0,0 +1,4 @@ + + + + \ No newline at end of file