Skip to content

Commit

Permalink
chore: update yaml (#439)
Browse files Browse the repository at this point in the history
* chore: update workflow yaml files to new `main` branch
* docs: update to `main` branch
  • Loading branch information
fubuloubu authored Jul 9, 2021
1 parent 4dbda81 commit b626994
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lint
on:
push:
branches:
- master
- main
- develop
pull_request:

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
with:
disable-autolabeler: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test
on:
push:
branches:
- master
- main
- develop
pull_request:

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ If you are new to [Yearn Finance](https://yearn.finance/), you might want to fam

## Setting up your environment

Before proceeding, please set up your environment by following these installation, building and testing [instructions](https://github.com/iearn-finance/yearn-vaults/blob/master/README.md).
Before proceeding, please set up your environment by following these installation, building and testing [instructions](https://github.com/iearn-finance/yearn-vaults/blob/main/README.md).

## Making your first contribution

Each time you begin a set of changes, ensure that you are working on a new branch that you have created as opposed to the `master` of your local repository. By keeping your changes segregated in this branch, merging your changes into the main repository later will be much simpler for the team.
Each time you begin a set of changes, ensure that you are working on a new branch that you have created as opposed to the `main` of your local repository. By keeping your changes segregated in this branch, merging your changes into the main repository later will be much simpler for the team.

To create a local branch for `git` to checkout, issue the command:

Expand All @@ -30,10 +30,10 @@ The official yearn-vaults repository may have changed since the time you cloned
git fetch origin
```

Then synchronize your master branch:
Then synchronize your main branch:

```bash
git pull origin master
git pull origin main
```

To stage the changed files that are be committed, issue the command:
Expand Down Expand Up @@ -80,7 +80,7 @@ git push git@github.com:<your_github_username>/yearn-vaults.git feature-in-progr

Navigate to your fork of the repository on Github. In the upper left where the current branch is listed, change the branch to your newly created one (feature-in-progress-branch). Open the files that you have worked on and ensure they include your changes.

Navigate to yearn-vault [repository](https://github.com/iearn-finance/yearn-vaults) and click on the new pull request button. In the “base” box on the left, leave the default selection “base master”, the branch that you want your changes to be applied to. In the “compare” box on the right, select the branch containing the changes you want to apply. You will then be asked to answer a few questions about your pull request. Pull requests should have enough context about what you are working on, how you are solving a problem, and reference all necessary information for your reviewers to help.
Navigate to yearn-vault [repository](https://github.com/iearn-finance/yearn-vaults) and click on the new pull request button. In the “base” box on the left, leave the default selection “base main”, the branch that you want your changes to be applied to. In the “compare” box on the right, select the branch containing the changes you want to apply. You will then be asked to answer a few questions about your pull request. Pull requests should have enough context about what you are working on, how you are solving a problem, and reference all necessary information for your reviewers to help.

After you complete the questionnaire, the pull request will appear in the [list](https://github.com/iearn-finance/yearn-vaults/pulls) of pull requests.

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ For full security process refer to yearn-security [repo](https://github.com/iear

## Scope

The scope of the Bug Bounty program spans smart contracts utilized in the Yearn ecosystem – the Solidity and/or Vyper smart contracts in the `contracts` folder of the `master` branch of the yearn-vaults [repo](https://github.com/iearn-finance/yearn-vaults), including historical deployments that still see active use on Ethereum Mainnet associated with YFI, and excluding any contracts used in a test-only capacity (including test-only deployments).
The scope of the Bug Bounty program spans smart contracts utilized in the Yearn ecosystem – the Solidity and/or Vyper smart contracts in the `contracts` folder of the `main` branch of the yearn-vaults [repo](https://github.com/iearn-finance/yearn-vaults), including historical deployments that still see active use on Ethereum Mainnet associated with YFI, and excluding any contracts used in a test-only capacity (including test-only deployments).

Note: Other contracts, outside of the ones mentioned above, might be considered on a case by case basis, please, reach out to the Yearn development team for clarification.
2 changes: 1 addition & 1 deletion contracts/BaseStrategy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ abstract contract BaseStrategy {
*
* It is expected that an external system will check `harvestTrigger()`.
* This could be a script run off a desktop or cloud bot (e.g.
* https://github.com/iearn-finance/yearn-vaults/blob/master/scripts/keep.py),
* https://github.com/iearn-finance/yearn-vaults/blob/main/scripts/keep.py),
* or via an integration with the Keep3r network (e.g.
* https://github.com/Macarse/GenericKeep3rV2/blob/master/contracts/keep3r/GenericKeep3rV2.sol).
* @param callCostInWei The keeper's estimated gas cost to call `harvest()` (in wei).
Expand Down
2 changes: 1 addition & 1 deletion contracts/Vault.vy
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
expected under Normal Operation.
For further details, please refer to the specification:
https://github.com/iearn-finance/yearn-vaults/blob/master/SPECIFICATION.md
https://github.com/iearn-finance/yearn-vaults/blob/main/SPECIFICATION.md
"""

API_VERSION: constant(String[28]) = "0.4.3"
Expand Down

0 comments on commit b626994

Please sign in to comment.