From 517cedab527779d6cf9644fa5671ea2f3ed97093 Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 18:48:31 -0700 Subject: [PATCH 1/7] attempt fix for build system Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index 5929133c05e..90dd6e4cef1 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -18,7 +18,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - fetch-depth: 0 + fetch-depth: 0 + - run: git config --system --add safe.directory /github/workspace - name: Setup Docsy run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli - name: Build And Deploy From dbf59939e083fa7176a31197ad706ecf1dfc44e6 Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 18:52:19 -0700 Subject: [PATCH 2/7] change checkout version Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index 90dd6e4cef1..d37180452f9 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest name: Build and Deploy Job steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive fetch-depth: 0 From a694bc09d2c41dc83045cac024c3cfef8cfb5e5f Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 18:55:11 -0700 Subject: [PATCH 3/7] elevated Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index d37180452f9..bcde30cf144 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -19,7 +19,7 @@ jobs: with: submodules: recursive fetch-depth: 0 - - run: git config --system --add safe.directory /github/workspace + - run: sudo git config --system --add safe.directory /github/workspace - name: Setup Docsy run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli - name: Build And Deploy From 3c38b1539c8ccb578929574fe64b635e8c70a618 Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 18:59:19 -0700 Subject: [PATCH 4/7] change system to global Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index bcde30cf144..54966e91760 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -19,7 +19,7 @@ jobs: with: submodules: recursive fetch-depth: 0 - - run: sudo git config --system --add safe.directory /github/workspace + - run: sudo git config --global --add safe.directory /github/workspace - name: Setup Docsy run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli - name: Build And Deploy From 566b61f9c02886ffffe8fec0590a7eaf04e7df4b Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 19:07:45 -0700 Subject: [PATCH 5/7] custom build command Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index 54966e91760..09ee23a3b69 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -15,11 +15,10 @@ jobs: runs-on: ubuntu-latest name: Build and Deploy Job steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: submodules: recursive fetch-depth: 0 - - run: sudo git config --global --add safe.directory /github/workspace - name: Setup Docsy run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli - name: Build And Deploy @@ -33,6 +32,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) skip_deploy_on_missing_secrets: true action: "upload" + app_build_command: 'git config --global --add safe.directory /github/workspace' ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_location: "/daprdocs" # App source code path From 7b36c912aa15b559cc101904010b4d04888068bf Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 20:03:15 -0700 Subject: [PATCH 6/7] fix app_build_command Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index 09ee23a3b69..d1b38557db7 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -32,13 +32,12 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) skip_deploy_on_missing_secrets: true action: "upload" - app_build_command: 'git config --global --add safe.directory /github/workspace' - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### += ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_location: "/daprdocs" # App source code path api_location: "api" # Api source code path - optional output_location: "public" # Built app content directory - optional - app_build_command: "hugo" + app_build_command: "git config --global --add safe.directory /github/workspace && hugo" ###### End of Repository/Build Configurations ###### close_pull_request_job: From df3f77e3a53c96297504a629fc1dae0ccfc8fab5 Mon Sep 17 00:00:00 2001 From: yaron2 Date: Mon, 8 May 2023 20:04:11 -0700 Subject: [PATCH 7/7] fix app_build_command Signed-off-by: yaron2 --- .github/workflows/website-v1-11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-v1-11.yml b/.github/workflows/website-v1-11.yml index d1b38557db7..f9df31cf3f1 100644 --- a/.github/workflows/website-v1-11.yml +++ b/.github/workflows/website-v1-11.yml @@ -32,7 +32,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) skip_deploy_on_missing_secrets: true action: "upload" -= ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig app_location: "/daprdocs" # App source code path api_location: "api" # Api source code path - optional