Skip to content

Commit

Permalink
Merge pull request #89 from solvaholic/issue86
Browse files Browse the repository at this point in the history
Remove OctoDNS installation to workflow step
  • Loading branch information
solvaholic authored Jun 19, 2022
2 parents 641d8a5 + ab2fd6a commit 8813f9f
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 88 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,23 @@ on:
paths:
- '*.yaml'

env:
AWS_ACCESS_KEY_ID: ${{ secrets.route53_aws_key_id }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.route53_aws_secret_access_key }}

jobs:
publish:
name: Publish DNS config from main
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Publish
uses: solvaholic/octodns-sync@main
- uses: actions/setup-python@v2
with:
python-version: '3.10'
- run: pip install -r requirements.txt
- uses: solvaholic/octodns-sync@main
with:
config_path: public.yaml
doit: '--doit'
env:
AWS_ACCESS_KEY_ID: ${{ secrets.route53_aws_key_id }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.route53_aws_secret_access_key }}
```
## Inputs
Expand Down Expand Up @@ -85,12 +87,6 @@ Provide a token to use, if you set `add_pr_comment` to "Yes".

Default `"Not set"`.

### `octodns_ref`

Select a release tag or a branch of octodns to use. For example "v0.9.14" or "awesome-feature".

Default `"v0.9.14"`.

## Outputs

### plan
Expand Down Expand Up @@ -123,10 +119,14 @@ on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: solvaholic/octodns-sync@latest
- uses: actions/setup-python@v2
with:
python-version: '3.10'
- run: pip install -r requirements.txt
- uses: solvaholic/octodns-sync@main
with:
config_path: public.yaml
add_pr_comment: 'Yes'
Expand Down
11 changes: 0 additions & 11 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ inputs:
not do it.'
required: false
default: ''
octodns_ref:
description: 'Select a release tag or a branch of octodns to use.'
required: true
default: 'v0.9.14'
pr_comment_token:
description: 'Provide a token to use, if you set add_pr_comment to Yes.'
required: true
Expand All @@ -33,13 +29,6 @@ outputs:
runs:
using: 'composite'
steps:
- name: Install octodns/octodns and dependencies
id: install
env:
OCTODNS_REF: ${{ inputs.octodns_ref }}
run: ${{ github.action_path }}/scripts/install.sh
shell: bash
working-directory: ${{ github.action_path }}
- name: Run octodns-sync
id: run
env:
Expand Down
3 changes: 2 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
### Changed

- ([#85](https://github.com/solvaholic/octodns-sync/issues/85)) Change default **octodns/octodns** from v0.9.12 to v0.9.14.
- ([#86](https://github.com/solvaholic/octodns-sync/issues/86)) Remove `octodns_ref` input and installation script.

### Deprecated
### Removed
### Fixed

- ([#41](https://github.com/solvaholic/octodns-sync/issues/41)) Document workaround for `add_pr_comment` adding a new comment for each run.
- ([#86](https://github.com/solvaholic/octodns-sync/issues/86)) This Action does not work with extracted providers.

### Security

Expand Down
18 changes: 13 additions & 5 deletions docs/add_pr_comment.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,16 @@ on:
jobs:
octodns-sync:
name: Run `octodns-sync` with public.yaml
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
plan: ${{ steps.generate-plan.outputs.plan }}
steps:
- uses: actions/checkout@v2
- uses: solvaholic/[email protected]
- uses: actions/setup-python@v2
with:
python-version: '3.10'
- run: pip install -r requirements.txt
- uses: solvaholic/octodns-sync@main
id: generate-plan
with:
config_path: public.yaml
Expand All @@ -52,7 +56,7 @@ jobs:
add-pr-comment:
name: Add `octodns-sync` plan to comment
needs: [octodns-sync]
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Find previous comment, if present
uses: peter-evans/[email protected]
Expand Down Expand Up @@ -85,10 +89,14 @@ on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: solvaholic/[email protected]
- uses: actions/setup-python@v2
with:
python-version: '3.10'
- run: pip install -r requirements.txt
- uses: solvaholic/octodns-sync@main
with:
config_path: public.yaml
add_pr_comment: 'Yes'
Expand Down
57 changes: 0 additions & 57 deletions scripts/install.sh

This file was deleted.

0 comments on commit 8813f9f

Please sign in to comment.