From abf2cd0ebe249d8726da4c1edbc245110027fe05 Mon Sep 17 00:00:00 2001 From: Barne Kleinen Date: Thu, 3 Oct 2024 22:52:16 +0200 Subject: [PATCH] move classes-module to outside dir; remove git submodule --- .github/workflows/deploy-staging-drafts.yml | 1 + .github/workflows/deploy-staging.yml | 1 + .gitmodules | 3 --- classes-module | 1 - config/_default/hugo.toml | 3 +-- config/development/hugo.toml | 3 +++ 6 files changed, 6 insertions(+), 6 deletions(-) delete mode 160000 classes-module diff --git a/.github/workflows/deploy-staging-drafts.yml b/.github/workflows/deploy-staging-drafts.yml index 0c5be9221..47f64b84d 100644 --- a/.github/workflows/deploy-staging-drafts.yml +++ b/.github/workflows/deploy-staging-drafts.yml @@ -37,6 +37,7 @@ jobs: cat data/gitinfo.yml - name: Build Hugo Site run: | + hugo mod get hugo --minify --buildDrafts --environment stagingdrafts # https://github.com/peaceiris/actions-gh-pages - name: Deploy to Staging Drafts on Github Pages diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 80cde35fe..01686e3f1 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -30,6 +30,7 @@ jobs: run: bin/hugo_deployment/gitversion.sh ${{ github.ref }} ${{ github.sha }} "${{ github.workflow }}" - name: Build Hugo Site run: | + hugo mod get hugo --minify --environment staging # https://github.com/peaceiris/actions-gh-pages - name: Deploy to Staging on Github Pages diff --git a/.gitmodules b/.gitmodules index 0848e2648..0eae8aaa3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "themes/greenpage"] path = themes/greenpage url = git@github.com:progwebtec/greenpage-theme.git -[submodule "classes-module"] - path = classes-module - url = git@github.com:progwebtec/classes-module.git diff --git a/classes-module b/classes-module deleted file mode 160000 index b12d54a7f..000000000 --- a/classes-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b12d54a7f6b4d0f0b53834870cadb086162e9ccb diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 8d19a6425..cff34b2dd 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -14,8 +14,7 @@ staticDir2 = ['static-snippets'] source = "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" target = "assets/js/bootstrap.bundle.min.js" [[module.imports]] - path = '../classes-module' - #path = 'github.com/progwebtec/courses-module' + path = 'github.com/progwebtec/classes-module' disabled = false [[module.imports.mounts]] diff --git a/config/development/hugo.toml b/config/development/hugo.toml index 9a218e583..f94276123 100644 --- a/config/development/hugo.toml +++ b/config/development/hugo.toml @@ -1,2 +1,5 @@ #baseURL = 'https://localhost:4242/~kleinen/' #baseURL = 'https://localhost:4242/' + +[module] + replacements = 'github.com/progwebtec/classes-module -> ../../classes-module'