From 218b72b81e7023176461991b1a99317df3dece9e Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 10:05:51 -0300 Subject: [PATCH 1/8] Agregar el deploy de GHA --- .github/workflows/build_site.yml | 3 +++ conf.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_site.yml b/.github/workflows/build_site.yml index 8455e6888..f108ec029 100644 --- a/.github/workflows/build_site.yml +++ b/.github/workflows/build_site.yml @@ -22,3 +22,6 @@ jobs: - name: Buildear con Nikola run: | nikola build + - name: Publicar pagina a GH Pages + run: | + nikola github_deploy \ No newline at end of file diff --git a/conf.py b/conf.py index 55bb9715a..498299d27 100644 --- a/conf.py +++ b/conf.py @@ -90,7 +90,7 @@ # in the default language will be shown instead. # What is the default language? -DEFAULT_LANG = "en" +DEFAULT_LANG = "es" # What other languages do you have? # The format is {"translationcode" : "path/to/translation" } @@ -635,15 +635,15 @@ # For more details, read the manual: # https://getnikola.com/handbook.html#deploying-to-github # You will need to configure the deployment branch on GitHub. -GITHUB_SOURCE_BRANCH = 'src' -GITHUB_DEPLOY_BRANCH = 'master' +GITHUB_SOURCE_BRANCH = 'master' +GITHUB_DEPLOY_BRANCH = 'gh_pages' # The name of the remote where you wish to push to, using github_deploy. GITHUB_REMOTE_NAME = 'origin' # Whether or not github_deploy should commit to the source branch automatically # before deploying. -GITHUB_COMMIT_SOURCE = True +GITHUB_COMMIT_SOURCE = False # Where the output site should be located # If you don't use an absolute path, it will be considered as relative From 5fb84aa17639ffb6195e9ca252b2db8ea8cbacd2 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 10:28:58 -0300 Subject: [PATCH 2/8] update actions versions --- .github/workflows/build_site.yml | 17 ++++++++++------- .github/workflows/deploy.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build_site.yml b/.github/workflows/build_site.yml index f108ec029..6813d4127 100644 --- a/.github/workflows/build_site.yml +++ b/.github/workflows/build_site.yml @@ -3,6 +3,12 @@ name: Construir el sitio con Nikola on: pull_request: branches: [ master ] + paths: + - conf.py + - pages/* + - themes/* + - plugins/* + - images/* jobs: build: @@ -10,11 +16,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -22,6 +28,3 @@ jobs: - name: Buildear con Nikola run: | nikola build - - name: Publicar pagina a GH Pages - run: | - nikola github_deploy \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 000000000..ff49613eb --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,27 @@ +name: Construir y publicar el sitio con Nikola + +on: + push: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements_freeze.txt + - name: Buildear con Nikola + run: | + nikola build + - name: Publicar pagina a GH Pages + run: | + nikola github_deploy \ No newline at end of file From 533f77adb0d74e58473b45438f771fcaded3b0b6 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 10:29:45 -0300 Subject: [PATCH 3/8] agregar paths --- .github/workflows/deploy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ff49613eb..af9011e82 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,13 @@ name: Construir y publicar el sitio con Nikola on: push: - branches: [ master ] + branches: [ master ] + paths: + - conf.py + - pages/* + - themes/* + - plugins/* + - images/* jobs: build: From 652da1e7197009898d0dcfe3e3ea3b36bdae6b84 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 10:31:07 -0300 Subject: [PATCH 4/8] fix paths in actions --- .github/workflows/build_site.yml | 8 ++++---- .github/workflows/deploy.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_site.yml b/.github/workflows/build_site.yml index 6813d4127..1a342e50e 100644 --- a/.github/workflows/build_site.yml +++ b/.github/workflows/build_site.yml @@ -5,10 +5,10 @@ on: branches: [ master ] paths: - conf.py - - pages/* - - themes/* - - plugins/* - - images/* + - pages/** + - themes/** + - plugins/** + - images/** jobs: build: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index af9011e82..16b75856b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,10 +5,10 @@ on: branches: [ master ] paths: - conf.py - - pages/* - - themes/* - - plugins/* - - images/* + - pages/** + - themes/** + - plugins/** + - images/** jobs: build: From a2d0e23bacb5b63a4b668ae1e589944b830dbd60 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 10:58:04 -0300 Subject: [PATCH 5/8] update requirements --- .github/workflows/build_site.yml | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_site.yml b/.github/workflows/build_site.yml index 1a342e50e..7887cb019 100644 --- a/.github/workflows/build_site.yml +++ b/.github/workflows/build_site.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements_freeze.txt + pip install -r requirements.txt - name: Buildear con Nikola run: | nikola build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 16b75856b..5f9ef2a5c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements_freeze.txt + pip install -r requirements.txt - name: Buildear con Nikola run: | nikola build From 700ff7f1bce3d55f296aae48bb4cddaa48dea39e Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 11:00:22 -0300 Subject: [PATCH 6/8] cambio espureo para testear --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5f9ef2a5c..978741a8b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,6 +10,8 @@ on: - plugins/** - images/** + workflow_dispatch: + jobs: build: From d107f58e1fc4c50063fde4ed829f4ce4ab861603 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 11:08:04 -0300 Subject: [PATCH 7/8] update requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8c2f95054..d9d033d5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -nikola==8.3.1 +nikola[extras]==8.3.1 flask==2.0.1 sentry-sdk[flask] \ No newline at end of file From ee06fc61ca7dc88495608dc34c9dd9f092f68994 Mon Sep 17 00:00:00 2001 From: akielbowicz Date: Sat, 22 Jun 2024 11:13:21 -0300 Subject: [PATCH 8/8] eliminar comando de dispatch --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 978741a8b..5f9ef2a5c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,8 +10,6 @@ on: - plugins/** - images/** - workflow_dispatch: - jobs: build: