From e247ff831aebb5a0c0cef291da7132c93a942749 Mon Sep 17 00:00:00 2001 From: Max Bohnet Date: Tue, 19 Dec 2023 10:41:14 +0100 Subject: [PATCH 1/2] more readme to toplevel --- matrixconverters/README.md => README.md | 0 matrixconverters/docs_rst/index.rst | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename matrixconverters/README.md => README.md (100%) diff --git a/matrixconverters/README.md b/README.md similarity index 100% rename from matrixconverters/README.md rename to README.md diff --git a/matrixconverters/docs_rst/index.rst b/matrixconverters/docs_rst/index.rst index f0b562d..0276f08 100644 --- a/matrixconverters/docs_rst/index.rst +++ b/matrixconverters/docs_rst/index.rst @@ -5,7 +5,7 @@ Matrixconverters has been developed to read and write PTV Matrices as xarray-Dat Readme File =========== -.. mdinclude:: ../README.md +.. mdinclude:: ../../README.md This documentation contains ================================= From 714664fe9873ca53133e7d0518a91c7b5e78fa0e Mon Sep 17 00:00:00 2001 From: Max Bohnet Date: Tue, 19 Dec 2023 10:48:51 +0100 Subject: [PATCH 2/2] also on merge pullrequest --- .github/workflows/linux-conda.yml | 3 +++ .github/workflows/windows_conda.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/linux-conda.yml b/.github/workflows/linux-conda.yml index aa9e86c..eac2173 100644 --- a/.github/workflows/linux-conda.yml +++ b/.github/workflows/linux-conda.yml @@ -4,6 +4,9 @@ on: pull_request: branches: - master + push: + branches: + - master jobs: build-linux: diff --git a/.github/workflows/windows_conda.yml b/.github/workflows/windows_conda.yml index 376a36f..8311b48 100644 --- a/.github/workflows/windows_conda.yml +++ b/.github/workflows/windows_conda.yml @@ -4,6 +4,9 @@ on: pull_request: branches: - master + push: + branches: + - master jobs: build-windows: