Skip to content

Commit

Permalink
Merge branch 'develop' into docs-consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
juliettech13 authored Jul 7, 2023
2 parents a930056 + b6a744f commit 0c61b0b
Show file tree
Hide file tree
Showing 73 changed files with 314 additions and 2,612 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/contract-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ jobs:
node-version: 16
- name: Install dependencies
run: cd ../../ && yarn install --pure-lockfile
- name: Build the osx-versions NPM package
run: yarn build
working-directory: packages/contracts-versions/
- name: Clean the contracts directory
run: yarn clean
- name: Check formatting
run: yarn run formatting:check
- name: Compile contracts
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/contracts-versions-tests.yml

This file was deleted.

19 changes: 8 additions & 11 deletions .github/workflows/documentation-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ jobs:
node-version: 16
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build the osx-versions NPM package
run: yarn build
working-directory: packages/contracts-versions/
- name: Clean the contracts directory
run: yarn clean
working-directory: packages/contracts/
Expand All @@ -30,25 +27,25 @@ jobs:
working-directory: packages/contracts/
- name: Format with prettier
run: yarn run prettier 'packages/contracts/docs/osx/03-reference-guide/**/*.md' --write
- name: Checkout builders-portal
- name: Checkout developer-portal
uses: actions/checkout@v3
with:
repository: aragon/builders-portal
repository: aragon/developer-portal
ref: staging
path: builders-portal
path: developer-portal
token: ${{ secrets.ARABOT_PAT }}
- name: Remove the docs/osx folder in the builders-portal
run: rm -rf $GITHUB_WORKSPACE/builders-portal/docs/osx
- name: Copy the docs/osx folder to the builders-portal
run: cp -R packages/contracts/docs/osx $GITHUB_WORKSPACE/builders-portal/docs/osx
- name: Remove the docs/osx folder in the developer-portal
run: rm -rf $GITHUB_WORKSPACE/developer-portal/docs/osx
- name: Copy the docs/osx folder to the developer-portal
run: cp -R packages/contracts/docs/osx $GITHUB_WORKSPACE/developer-portal/docs/osx
- name: Get short commit hash
id: hash
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.ARABOT_PAT }}
path: builders-portal
path: developer-portal
commit-message: 'Update the Aragon OSx docs by commit ${{ steps.hash.outputs.sha_short }}'
committer: 'Arabot <[email protected]>'
branch: patch/aragon-osx-docs
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/subgraph-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ jobs:
node-version: 16
- name: Install dependencies
run: yarn
- name: Build contracts-versions
run: yarn run build:contracts-versions
- name: Build contracts
run: yarn run build:contracts
- name: Build manifest
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
![Aragon](https://res.cloudinary.com/dacofvu8m/image/upload/v1677353961/Aragon%20CodeArena/osx_blue_logo_lqrvkr.png)

<p align="center">
<a href="https://aragon.org/">Aragon website</a>
<a href="https://devs.aragon.org/">Developer Portal</a>
<a href="https://aragonproject.typeform.com/to/LngekEhU">Join our Developer Community</a>
<a href="https://aragonproject.typeform.com/dx-contribution">Contribute</a>
</p>

<br/>

# Aragon OSx Protocol

The Aragon OSx protocol is the foundation layer of the new Aragon stack. It allows users to create, manage, and customize DAOs in a way that is lean, adaptable, and secure.
Expand Down
3 changes: 0 additions & 3 deletions packages/contracts-versions/.gitignore

This file was deleted.

71 changes: 0 additions & 71 deletions packages/contracts-versions/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions packages/contracts-versions/commit_hashes.json

This file was deleted.

107 changes: 0 additions & 107 deletions packages/contracts-versions/create-contract-versions.ts

This file was deleted.

4 changes: 0 additions & 4 deletions packages/contracts-versions/jest.config.js

This file was deleted.

46 changes: 0 additions & 46 deletions packages/contracts-versions/package.json

This file was deleted.

Loading

0 comments on commit 0c61b0b

Please sign in to comment.