From 1a6f0ea9484659cf4c719bc702a3ef31f63e4e94 Mon Sep 17 00:00:00 2001 From: Peter Nashaat Date: Sun, 20 Aug 2023 07:18:12 +0000 Subject: [PATCH] actions new repo --- .github/workflows/action.yml | 19 ------------------- .github/workflows/tf_update_dev.yml | 4 ++-- .github/workflows/tf_update_prod.yml | 4 ++-- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/action.yml diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml deleted file mode 100644 index 4f0e229..0000000 --- a/.github/workflows/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Zola on GitHub Pages - -on: - push: - branches: - - development - -jobs: - build: - name: Publish site - runs-on: ubuntu-latest - steps: - - name: Checkout development - uses: actions/checkout@v3.0.0 - - name: Build and deploy - uses: shalzz/zola-deploy-action@v0.16.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - \ No newline at end of file diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index 2af1585..63f100b 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -18,7 +18,7 @@ jobs: script: | cd websites/www2/www_ourworld_tf/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/development sed -i "s/https:\/\/www.ourworld.tf/https:\/\/www2.ourworld.tf/g" config.toml ./build.sh diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 19ebfce..28a5fc5 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -18,7 +18,7 @@ jobs: script: | cd websites/www_ourworld_tf/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/development sed -i "s/https:\/\/www2.ourworld.tf/https:\/\/ourworld.tf/g" config.toml ./build.sh