Skip to content

Commit bb6433e

Browse files
authored
Merge pull request #70 from lsst-sqre/tickets/DM-47580/cherrypick
DM-47580: Backport slack channel and build changes
2 parents 5d7bc09 + 36b34ad commit bb6433e

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
python-version: ${{ matrix.python }}
3232
tox-envs: "lint,typing,py"
3333
env:
34-
LTD_TEST_AWS_ID: ${{ secrets.LTD_TEST_AWS_ID }}
34+
LTD_TEST_AWS_ID: ${{ vars.LTD_TEST_AWS_ID }}
3535
LTD_TEST_AWS_SECRET: ${{ secrets.LTD_TEST_AWS_SECRET }}
36-
LTD_TEST_BUCKET: ${{ secrets.LTD_TEST_BUCKET }}
36+
LTD_TEST_BUCKET: ${{ vars.LTD_TEST_BUCKET }}
3737

3838
docs:
3939

CHANGELOG.rst

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Change log
33
##########
44

5+
0.8.4 (2024-11-19)
6+
==================
7+
8+
Changed
9+
-------
10+
11+
- Change Slack channel references to refer to channels in the Rubin Slack instance.
12+
513
0.8.3 (2024-02-22)
614
==================
715

docs/development.rst

+10
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,13 @@ Releases are made by creating a Git tag with a semantic version and pushing to G
2929
git push --tags
3030
3131
Travis CI creates the PyPI release itself and `setuptools_scm <https://github.com/pypa/setuptools_scm/>`_ ensures the PyPI version matches the Git tag.
32+
33+
GitHub CI
34+
=========
35+
36+
The GitHub CI action needs AWS creds and an existing S3 bucket.
37+
These creds and the bucket name are injected via repository-scoped Actions `secrets <https://github.com/lsst-sqre/ltd-conveyor/settings/secrets/actions>`_ and `variables <https://github.com/lsst-sqre/ltd-conveyor/settings/variables/actions>`_
38+
39+
These creds are attached to the `ltd-conveyor-tests IAM user <https://us-east-1.console.aws.amazon.com/iam/home?region=us-west-2#/users/details/ltd-conveyor-tests?section=permissions>`_.
40+
This user has an attached `ltd-conveyor-tests policy <https://us-east-1.console.aws.amazon.com/iam/home?region=us-west-2#/policies/details/arn%3Aaws%3Aiam%3A%3A039289279626%3Apolicy%2Fltd-conveyor-tests?section=permissions>`_.
41+
This policy grants access to the `lsst-the-docs-test S3 bucket <https://us-west-2.console.aws.amazon.com/s3/buckets/lsst-the-docs-test?region=us-west-2&bucketType=general&tab=objects>`_.

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dev =
5959
Sphinx
6060
mypy
6161
types-requests
62-
types-pkg_resources
62+
types-setuptools
6363

6464
[options.entry_points]
6565
console_scripts =

src/ltdconveyor/keeper/build.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def register_build(
7575
raise KeeperError(
7676
f"Could not register a new build for the project {product}. "
7777
"It's possible that the project is not registered yet. Please "
78-
"contact #dm-docs-support on Slack.",
78+
"contact #square-docs-support on Slack.",
7979
r2.status_code,
8080
r2.text,
8181
)
@@ -84,7 +84,7 @@ def register_build(
8484
f"Could not register a new build for the project {product}. "
8585
"It's possible that another build is currently underway. Please "
8686
"re-run the documentation job in a few minutes. If the problem "
87-
"persists, contact #dm-docs-support on Slack.",
87+
"persists, contact #square-docs-support on Slack.",
8888
r.status_code,
8989
r.text,
9090
)
@@ -117,7 +117,7 @@ def confirm_build(build_url: str, keeper_token: str) -> None:
117117
if r.status_code != 200:
118118
raise KeeperError(
119119
f"Could not confirm build upload for {build_url}. "
120-
"Contact #dm-docs-support on Slack",
120+
"Contact #square-docs-support on Slack",
121121
r.status_code,
122122
r.text,
123123
)

0 commit comments

Comments
 (0)