Skip to content

Commit

Permalink
Merge pull request #99 from alvin-reyes/master
Browse files Browse the repository at this point in the history
chore: added docker file and github workflows
  • Loading branch information
Alvin Reyes authored Aug 11, 2022
2 parents 1d01356 + c1903ac commit 6ac0cab
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 1 deletion.
72 changes: 72 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "master" ]
tags:
- '*'
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
37 changes: 37 additions & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Go

on:
push:
branches: [ "master" ]
tags:
- '*'
pull_request:
branches: [ "master" ]

jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
default: true

- name: Install dependencies
run: |
sudo apt update
sudo apt install hwloc libhwloc-dev jq ocl-icd-opencl-dev
- name: Build
run: make clean all

- name: Test
run: go test -v ./...
18 changes: 18 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM golang:1.17-stretch AS builder
USER root
RUN apt-get update && \
apt-get install -y wget jq hwloc ocl-icd-opencl-dev git libhwloc-dev pkg-config make && \
apt-get install -y cargo
WORKDIR /app/

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"
RUN cargo --help
ARG TAG=${TAG}
RUN echo ${TAG}
RUN git clone https://github.com/application-research/filclient . && \
git pull && \
git fetch --all --tags && \
git checkout ${TAG} && \
make
USER 1001
7 changes: 6 additions & 1 deletion filc/printing.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Fast Retrieval: %t
state.FastRetrieval,
)

stateProposalLabel, err := state.Proposal.Label.ToString()
if err != nil {
fmt.Printf("Message: %s\n", state.Message)
stateProposalLabel = ""
}
if state.Proposal != nil {
fmt.Printf(`Proposal:
Piece CID: %s
Expand All @@ -64,7 +69,7 @@ Fast Retrieval: %t
state.Proposal.VerifiedDeal,
state.Proposal.Client,
state.Proposal.Provider,
state.Proposal.Label,
stateProposalLabel,
state.Proposal.StartEpoch,
state.Proposal.EndEpoch,
state.Proposal.StoragePricePerEpoch, types.FIL(state.Proposal.StoragePricePerEpoch),
Expand Down

0 comments on commit 6ac0cab

Please sign in to comment.