diff --git a/.gitea/workflows/build-feature.yml b/.gitea/workflows/build-feature.yml index 4c32053..63c0297 100644 --- a/.gitea/workflows/build-feature.yml +++ b/.gitea/workflows/build-feature.yml @@ -12,13 +12,6 @@ on: required: true type: string -env: - # GITEA_API_URL: ${{ fromJson(inputs.env_json).GITEA_API_URL }} - # PAGES_HOST: ${{ fromJson(inputs.env_json).PAGES_HOST }} - # GIT_PAGES_PUBLISH_URL: ${{ fromJson(inputs.env_json).GIT_PAGES_PUBLISH_URL }} - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - GIT_PAGES_PUBLISH_TOKEN: ${{ secrets.GIT_PAGES_PUBLISH_TOKEN }} - jobs: bats: runs-on: ubuntu-latest diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e551a05..b9146e2 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -7,6 +7,7 @@ on: jobs: load-config: uses: niko/gitea-ci-library/.gitea/workflows/config-provider.yml@feature/pipeline-cleanup + secrets: inherit with: config_path: .gitea/workflows/feature-env.conf diff --git a/.gitea/workflows/config-provider.yml b/.gitea/workflows/config-provider.yml index af4ad80..ea93c8f 100644 --- a/.gitea/workflows/config-provider.yml +++ b/.gitea/workflows/config-provider.yml @@ -5,10 +5,22 @@ on: config_path: required: true type: string + secrets: + GITEA_TOKEN: + required: true + GIT_PAGES_PUBLISH_TOKEN: + required: true outputs: env_json: value: ${{ jobs.parse-config.outputs.json_data }} +env: + GITEA_API_URL: ${{ fromJson(jobs.parse-config.outputs.json_data).GITEA_API_URL }} + PAGES_HOST: ${{ fromJson(jobs.parse-config.outputs.json_data).PAGES_HOST }} + GIT_PAGES_PUBLISH_URL: ${{ fromJson(jobs.parse-config.outputs.json_data).GIT_PAGES_PUBLISH_URL }} + GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + GIT_PAGES_PUBLISH_TOKEN: ${{ secrets.GIT_PAGES_PUBLISH_TOKEN }} + jobs: parse-config: runs-on: ubuntu-latest