Skip to content

Commit 3ffe771

Browse files
authored
Merge branch 'main' into Dec25-variable-updates
2 parents 254c3c1 + 6243b37 commit 3ffe771

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

.github/workflows/prod-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
env:
5353
ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
5454
run: |
55+
echo "::add-mask::$ANSIBLE_VAULT_PASSWORD"
5556
printf '%s' "${ANSIBLE_VAULT_PASSWORD}" > "$HOME/.vault"
5657
chmod 600 "$HOME/.vault"
5758

.github/workflows/qa-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
env:
4848
ANSIBLE_VAULT_PASSWORD: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
4949
run: |
50+
echo "::add-mask::$ANSIBLE_VAULT_PASSWORD"
5051
printf '%s' "${ANSIBLE_VAULT_PASSWORD}" > "$HOME/.vault"
5152
chmod 600 "$HOME/.vault"
5253

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "airflow-docker-dev-setup"]
22
path = airflow-docker-dev-setup
33
url = [email protected]:tulibraries/airflow-docker-dev-setup.git
4-
[submodule ".circleci/shared-scripts"]
5-
path = .circleci/shared-scripts
4+
[submodule ".github/shared-scripts"]
5+
path = .github/shared-scripts
66
url = [email protected]:tulibraries/shared-scripts.git

Pipfile.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# PA Digital Aggregator DAGs
22

3-
[![CircleCI](https://circleci.com/gh/tulibraries/funcake_dags.svg?style=svg)](https://circleci.com/gh/tulibraries/funcake_dags)
43
![pylint Score](https://mperlet.github.io/pybadge/badges/9.47.svg)
54

65
This repository contains files related to Airflow DAGs (Directed Acyclic Graphs, e.g. data processing workflows) used for PA Digital aggregation processes.
@@ -45,7 +44,6 @@ On initial startup, the dashboard may display an empty or partial list of DAGs a
4544
- [Airflow Docker Development Setup](https://github.com/tulibraries/airflow-docker-dev-setup)
4645
- [Ansible Playbook Airflow](https://github.com/tulibraries/ansible-playbook-airflow)
4746
- [Apache Airflow](https://airflow.apache.org/docs/)
48-
- [CircleCI](https://circleci.com/docs/2.0/configuration-reference/)
4947
- [tulflow](https://github.com/tulibraries/tulflow)
5048

5149
### Make Commands
@@ -79,7 +77,7 @@ Use `pytest` to run unit and functional tests on this project.
7977
$ pipenv run pytest
8078
```
8179

82-
`lint` and `pytest` are run automatically by CircleCI on each pull request.
80+
`lint` and `pytest` are run automatically by GitHub actions on each pull request.
8381

8482

8583
You may also test using `airflow-docker-dev-setup/Makefile`
@@ -96,6 +94,6 @@ $ make -f airflow-docker-dev-setup/Makefile test
9694

9795
## Deployment
9896

99-
QA: CircleCI checks (lints and tests) code and deploys to the QA server when development branches are merged into the `main` branch.
97+
QA: GitHub action checks (lints and tests) code and deploys to the QA server when development branches are merged into the `main` branch.
10098

101-
Production: When a development branch is merged into `main` it creates a request_prod_deploy job. To deploy code to the production server, you will need to go to the circleCI User Interface and approve the pending job. See the [CircleCI configuration file](cob_datapipeline/.circleci/config.yml) for details.
99+
Production: When a development branch is merged into `main` it creates a request_prod_deploy job. To deploy code to the production server, you will need to approve the pending job in the #aggregator channel on Slack. You will see a GitHub action notification that says Deployment review requested, waiting for review. Click on the link and follow the instructions.

0 commit comments

Comments
 (0)