Skip to content

Commit

Permalink
Merge pull request #63 from district0x/report_2023
Browse files Browse the repository at this point in the history 
Update reports and fix image build
  • Loading branch information
@sm47916
sm47916 committed Dec 7, 2023
2 parents 9a8d787 + aeb79a8 commit 1129cf9
Show file tree
Hide file tree
Showing 11 changed files with 104 additions and 38 deletions.
72 changes: 54 additions & 18 deletions .github/workflows/docker_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,66 @@ on:
name: build and push docker image

jobs:
build-and-push:
docker-release:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
file: docker-builds/Dockerfile
push: true
tags: ${{ secrets.ECR_REGISTRY }}/district0x-landing-page:${{ github.sha }},${{ secrets.ECR_REGISTRY }}/district0x-landing-page:latest

docker-qa:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/master'
steps:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
- name: Build push image on commit
env:
ECR_REGISTRY: ${{ secrets.ECR_REGISTRY }}
ECR_REPOSITORY: "district0x-landing-page"
IMAGE_TAG: ${{ github.sha }}
run: |
echo "Building on ${GITHUB_REF} branch"
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f docker-builds/Dockerfile .
if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
echo "On the default branch will push to the registry with latest and ${IMAGE_TAG} tags"
docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
fi
uses: aws-actions/amazon-ecr-login@v2

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
file: docker-builds/Dockerfile
push: true
tags: ${{ secrets.ECR_REGISTRY }}/district0x-landing-page:${{ github.sha }},${{ secrets.ECR_REGISTRY }}/district0x-landing-page:qa
10 changes: 10 additions & 0 deletions cn/transparency/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,16 @@ <h2>2022</h2>
</tr>
</tbody>
</table>
<h2>2023</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
</tr>
</tbody>
</table>
</header>
<p>季度报告显示了了我们项⽬目最近活动的概述及当前的财务状况. 未来的更更新消息将在每个季度结束后公布
</p>
Expand Down
Binary file added docs/district0x-Network-Report-Q1-2023.pdf
View file
Binary file not shown.
Binary file added docs/district0x-Network-Report-Q2-2023.pdf
View file
Binary file not shown.
Binary file added docs/district0x-Network-Report-Q3-2023.pdf
View file
Binary file not shown.
Binary file modified images/parts/build-badge@21.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/parts/vote-seal-bg-2021.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/parts/vote-seal-bg.png
100755 → 100644
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/parts/vote-seal.png
100755 → 100644
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 30 additions & 20 deletions ko/transparency/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,54 +350,64 @@ <h2>2018</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q1-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2018.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
</tr>
</tbody>
</table>
<h2>2019</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q1-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2019.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
</tr>
</tbody>
</table>
<h2>2020</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q1-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2020.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
</tr>
</tbody>
</table>
<h2>2021</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q1-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2021.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
</tr>
</tbody>
</table>
<h2>2022</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q1-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q4-2022.pdf" target="_blank" rel="noopener noreferrer"><h3>Q4</h3></a></td>
</tr>
</tbody>
</table>
<h2>2023</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
</tr>
</tbody>
</table>
Expand Down
10 changes: 10 additions & 0 deletions transparency/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,16 @@ <h2>2022</h2>
</tr>
</tbody>
</table>
<h2>2023</h2>
<table>
<tbody>
<tr>
<td><a href="../docs/district0x-Network-Report-Q1-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q1</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q2-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q2</h3></a></td>
<td><a href="../docs/district0x-Network-Report-Q3-2023.pdf" target="_blank" rel="noopener noreferrer"><h3>Q3</h3></a></td>
</tr>
</tbody>
</table>
</header>
<p>Our quarterly reports provide an overview of recent project activity and a glimpse at our current financials. Future updates will be published following the completion of each quarter.
</p>
Expand Down

0 comments on commit 1129cf9

Please sign in to comment.