Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove private module dependencies #277

Merged
merged 1 commit into from
Jul 13, 2021
Merged

chore: remove private module dependencies #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 6
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v4
with:
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/sims.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand Down Expand Up @@ -56,10 +52,6 @@ jobs:
runs-on: ubuntu-latest
needs: [build, install-runsim]
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand All @@ -86,10 +78,6 @@ jobs:
runs-on: ubuntu-latest
needs: [build, install-runsim]
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ jobs:
matrix:
go-arch: ["amd64", "arm", "arm64"]
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand All @@ -62,10 +58,6 @@ jobs:
# test-cosmovisor:
# runs-on: ubuntu-latest
# steps:
# - name: Configure git for private modules
# env:
# TOKEN: ${{ secrets.TOKEN }}
# run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
# - uses: actions/checkout@v2
# - uses: actions/setup-go@v2.1.3
# with:
Expand All @@ -88,10 +80,6 @@ jobs:
split-test-files:
runs-on: ubuntu-latest
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
Expand Down Expand Up @@ -123,10 +111,6 @@ jobs:
matrix:
part: ["00", "01", "02", "03"]
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand Down Expand Up @@ -204,10 +188,6 @@ jobs:
matrix:
part: ["00", "01", "02", "03"]
steps:
- name: Configure git for private modules
env:
TOKEN: ${{ secrets.TOKEN }}
run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.3
with:
Expand Down Expand Up @@ -274,10 +254,6 @@ jobs:
# runs-on: ubuntu-latest
# timeout-minutes: 10
# steps:
# - name: Configure git for private modules
# env:
# TOKEN: ${{ secrets.TOKEN }}
# run: git config --global url."https://${TOKEN}:x-oauth-basic@github.com".insteadOf "https://github.com"
# - uses: actions/checkout@v2
# - uses: actions/setup-go@v2.1.3
# with:
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ WORKDIR /go/src/github.com/line/lfb-sdk
COPY . .

# install simapp, remove packages
# TODO ebony: fix module download error in docker
RUN go env -w GOPRIVATE=github.com/line/*
RUN git config --global url."https://$GITHUB_TOKEN:x-oauth-basic@github.com/".insteadOf "https://github.com/"
RUN make build-linux


Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ proto-all: proto-format proto-lint proto-gen

proto-gen:
@echo "Generating Protobuf files"
$(DOCKER) run --rm -e GITHUB_TOKEN=$(GITHUB_TOKEN) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen.sh
$(DOCKER) run --rm -e -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen.sh

proto-format:
@echo "Formatting Protobuf files"
Expand Down
2 changes: 0 additions & 2 deletions scripts/protocgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ set -eo pipefail

# TODO ebony
apk add --no-cache git
go env -w GOPRIVATE=github.com/line/*
git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/"

protoc_gen_gocosmos() {
if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &>/dev/null ; then
Expand Down