Skip to content

Commit

Permalink
Merge branch 'trunk' into update_enroll_access
Browse files Browse the repository at this point in the history
  • Loading branch information
srieteja committed Oct 2, 2023
2 parents 8283afc + d1f7d4d commit 846a8bb
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 251 deletions.
7 changes: 5 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@ updates:
- package-ecosystem: "docker"
directory: "/tools/build_virtual_environment/ve_base"
schedule:
interval: "daily"
interval: "daily"
- package-ecosystem: "docker"
directory: "/packages/at_root_server"
schedule:
interval: "daily"
- package-ecosystem: "pub"
directory: "/packages/at_root_server"
schedule:
interval: "daily"
- package-ecosystem: "pub"
directory: "/packages/at_secondary_server"
schedule:
Expand All @@ -30,4 +34,3 @@ updates:
directory: "/tools" # Location of package manifests
schedule:
interval: "daily"

4 changes: 2 additions & 2 deletions .github/workflows/at_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
sdk: stable
# Setup python
- name: Set up Python
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: '3.8'
# Install python packages
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:

# Setup python
- name: Set up Python
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: '3.8'

Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/melos_bootstrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Melos bootstrap"
on:
workflow_dispatch:
inputs:
melos_args:
description: "Melos arguments"
required: false
default: '--ignore="at_root_server" --ignore="at_secondary"'
pull_request:

permissions:
contents: read

env:
default_melos_args: '--ignore="at_root_server" --ignore="at_secondary"'

jobs:
melos-bootstrap:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
with:
channel: "stable"
- name: flutter pub get
run: flutter pub get
- name: Do melos bootstrap
run: dart run melos bootstrap ${{ github.events.inputs.melos_args || env.default_melos_args }}
2 changes: 1 addition & 1 deletion .github/workflows/refreshcerts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: SSL Renewal for vip.ve.atsign.zone
steps:
- name: Set up Python
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.9 #install the python needed
- name: setup certinfo
Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/update_python_requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Bump requirements.txt
on:
pull_request:
paths:
- 'tools/pyproject.toml'
workflow_dispatch:

permissions:
pull-requests: write

jobs:
bump_requirements:
runs-on: ubuntu-latest

steps:
- name: Checkout this repo
if: ${{ github.actor == 'dependabot[bot]' }}
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.MY_GITHUB_TOKEN }}

- name: Set up Python
if: ${{ github.actor == 'dependabot[bot]' }}
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: '3.11'

- name: Install Poetry
if: ${{ github.actor == 'dependabot[bot]' }}
uses: abatilo/actions-poetry@192395c0d10c082a7c62294ab5d9a9de40e48974 # v2.3.0
with:
poetry-version: '1.6.1'

- name: Bump Python dependencies
if: ${{ github.actor == 'dependabot[bot]' }}
run: |
cd tools
poetry update
poetry export --format requirements.txt --output requirements.txt
git config --global user.name 'dependabot[bot]'
git config --global user.email 'dependabot[bot]@users.noreply.github.com'
git add requirements.txt
if [ -z "$(git status --porcelain)" ]; then
echo 'No changes to commit on this run'
exit 0
else
git commit -m "build(deps): Bump requirements.txt"
git push
fi
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build/

# If you're building an application, you may want to check-in your pubspec.lock
pubspec.lock
pubspec_overrides.yaml # melos
pubspec_overrides.yaml

# Directory created by dartdoc
# If you don't generate documentation locally you can remove this line.
Expand All @@ -31,3 +31,10 @@ doc/api/
*/certs/*
.vscode/
storage

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
poetry.lock
12 changes: 9 additions & 3 deletions melos.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: at_server

packages:
- packages/**
- packages/*
- packages/*/example

- tests/**
- tools/build_virtual_environment/install_PKAM_Keys
- tests/*
- tools/build_virtual_environment/install_PKAM_Keys

command:
bootstrap:
hooks:
pre: dart pub get -C tests/at_functional_test
2 changes: 1 addition & 1 deletion packages/at_root_server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dart:3.1.2@sha256:05f1c1035f0090f8fcc340630f09782215ae2dfc6c17941756d3a716b16f8ec5 AS buildimage
FROM dart:3.1.3@sha256:97cc20588eb7171f611606fff26bc04fb2aec5e68f7341060252a409bf7a86ce AS buildimage
ENV HOMEDIR=/atsign
ENV BINARYDIR=/usr/local/at
ENV USER_ID=1024
Expand Down
2 changes: 1 addition & 1 deletion tools/build_secondary/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dart:3.1.2@sha256:05f1c1035f0090f8fcc340630f09782215ae2dfc6c17941756d3a716b16f8ec5 AS buildimage
FROM dart:3.1.3@sha256:97cc20588eb7171f611606fff26bc04fb2aec5e68f7341060252a409bf7a86ce AS buildimage
ENV HOMEDIR=/atsign
ENV USER_ID=1024
ENV GROUP_ID=1024
Expand Down
2 changes: 1 addition & 1 deletion tools/build_secondary/Dockerfile.observe
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dart:3.1.2@sha256:05f1c1035f0090f8fcc340630f09782215ae2dfc6c17941756d3a716b16f8ec5 AS buildimage
FROM dart:3.1.3@sha256:97cc20588eb7171f611606fff26bc04fb2aec5e68f7341060252a409bf7a86ce AS buildimage
ENV HOMEDIR=/atsign
ENV USER_ID=1024
ENV GROUP_ID=1024
Expand Down
2 changes: 1 addition & 1 deletion tools/build_virtual_environment/ve/Dockerfile.vip
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dart:3.1.2@sha256:05f1c1035f0090f8fcc340630f09782215ae2dfc6c17941756d3a716b16f8ec5 AS buildimage
FROM dart:3.1.3@sha256:97cc20588eb7171f611606fff26bc04fb2aec5e68f7341060252a409bf7a86ce AS buildimage
ENV USER_ID=1024
ENV GROUP_ID=1024
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion tools/build_virtual_environment/ve_base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dart:3.1.2@sha256:05f1c1035f0090f8fcc340630f09782215ae2dfc6c17941756d3a716b16f8ec5 AS buildimage
FROM dart:3.1.3@sha256:97cc20588eb7171f611606fff26bc04fb2aec5e68f7341060252a409bf7a86ce AS buildimage
ENV USER_ID=1024
ENV GROUP_ID=1024
WORKDIR /app
Expand Down
Loading

0 comments on commit 846a8bb

Please sign in to comment.