From 07239b7fd2a69fce76cc9562c454fc6a68a212b0 Mon Sep 17 00:00:00 2001 From: Max Gaukler Date: Tue, 23 Jan 2024 19:15:41 +0100 Subject: [PATCH] Fix CI (hopefully) --- .github/workflows/unittest.yml | 16 ++++++++++++++++ .github/workflows/vagrant-unittest.yml | 24 ------------------------ install_debian.sh | 6 +++++- 3 files changed, 21 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/unittest.yml delete mode 100644 .github/workflows/vagrant-unittest.yml diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml new file mode 100644 index 0000000..eba1311 --- /dev/null +++ b/.github/workflows/unittest.yml @@ -0,0 +1,16 @@ +name: Run Unittests + +on: [push, pull_request] + +jobs: + vagrant-run-unittest: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v2 + + - name: install dependencies + run: sudo ./install_debian.sh + + - name: Run Unittests + run: ./run_unittests_locally.sh diff --git a/.github/workflows/vagrant-unittest.yml b/.github/workflows/vagrant-unittest.yml deleted file mode 100644 index fc4b1e9..0000000 --- a/.github/workflows/vagrant-unittest.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Vagrant run Unittest - -on: [pull_request] - -jobs: - vagrant-run-unittest: - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - - name: Cache Vagrant boxes - uses: actions/cache@v3 - with: - path: ~/.vagrant.d/boxes - key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }} - restore-keys: | - ${{ runner.os }}-vagrant- - - - name: Run vagrant provision - run: vagrant provision - - - name: Run Unittests - run: ./run_unittests_in_vagrant.sh diff --git a/install_debian.sh b/install_debian.sh index 9ef8b49..38971a7 100755 --- a/install_debian.sh +++ b/install_debian.sh @@ -3,7 +3,11 @@ set -e # provisioning for Debian / Ubuntu echo "ONLY RUN THIS SCRIPT on a disposable VM or a PC specially for setting up kasse. It will change your xsession and uninstall some packages." echo "press ctrl-c to exit, Enter to continue (will continue automatically under Vagrant provisioner)" -read +if "$GITHUB_ACTIONS" == 1 + echo "continuing, we are in GitHub CI" +else + read +fi [ -d /home/vagrant ] && echo "Running under Vagrant, using the vagrant user" && RUNNING_IN_VAGRANT=true || RUNNING_IN_VAGRANT=false