Skip to content

Commit

Permalink
Prepare v0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Caspar Oostendorp committed Feb 24, 2024
1 parent e9b953c commit 1b1e6de
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
./web/dist
./web/node_modules
./web/.env
#./web/.env
./contracts/target
./bots/.env
./bots/node_modules
110 changes: 6 additions & 104 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ jobs:
permissions:
contents: write
packages: write
id-token: write
steps:
- name: Checkout repository
uses: actions/checkout@v4

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

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Depot CLI
uses: depot/setup-action@v1

- name: Log in to the Container registry
uses: docker/login-action@v3
Expand All @@ -47,15 +45,14 @@ jobs:
type=semver,pattern={{version}}
type=sha
- name: Build and push Docker image
uses: docker/build-push-action@v5
- uses: depot/build-push-action@v1
with:
context: .
push: true
secrets: |
MIGRATOR_PRIVATE_KEY=${{ secrets.MIGRATOR_PRIVATE_KEY }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Create GitHub Release
env:
Expand All @@ -64,98 +61,3 @@ jobs:
TAG=${{ github.ref }}
VERSION=${TAG#refs/tags/}
gh release create $VERSION -t $VERSION -n "Release notes for $VERSION"
# helmTest:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v2
#
# - name: Install Helm
# run: |
# curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
# chmod 700 get_helm.sh
# ./get_helm.sh
#
# - name: Lint Helm Chart
# run: |
# helm lint --values ./deployment/$DEPLOY_NAME/values.yaml ./deployment/$DEPLOY_NAME

#
# helmRelease:
# needs: [ helmTest ]
# runs-on: ubuntu-latest
# permissions:
# contents: write
# pull-requests: write
# steps:
# - name: Checkout
# uses: actions/checkout@v2
# with:
# fetch-depth: 0
#
# - name: Configure Git
# run: |
# git config user.name "$GITHUB_ACTOR"
# git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
#
# - name: Install Helm
# uses: azure/setup-helm@v1
# with:
# version: v3.8.1
#
# - name: custom packaging
# run: |
# VERSION=${{github.ref_name}}
# rm -rf .cr-release-packages
# mkdir -p .cr-release-packages
# helm package deployment/$DEPLOY_NAME --app-version=${VERSION:1} --version=${VERSION:1} --destination=.cr-release-packages
#
# - name: Run chart-releaser
# # switch back to helm/chart-releaser-action if this contribution is ever mergedd
# uses: askcloudarchitech/chart-releaser-action@skip-packaging-option
# with:
# skip_packaging: true
# env:
# CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
#
# - name: Create GitHub Release
# env:
# GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
# run: |
# TAG=${{ github.ref }}
# VERSION=${TAG#refs/tags/}
# gh release create $VERSION -t $VERSION -n "Release notes for $VERSION"


# deploy:
# needs: [ buildImage ]
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v2
#
# - name: Install ArgoCD CLI if not exists
# run: |
# if ! command -v argocd &> /dev/null; then
# curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64
# chmod +x /usr/local/bin/argocd
# fi
#
# - name: Deploy Application Dry Run
# env:
# ARGOCD_SERVER: ${{ secrets.ARGOCD_SERVER }}
# ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_AUTH_TOKEN }}
# run: |
# argocd app create $DEPLOY_NAME \
# --repo https://pixelaw.github.io/core/ \
# --path deployment/ \
# --revision ${VERSION:1} \
# --helm-chart $DEPLOY_NAME \
# --dest-namespace $DEPLOY_NAME-main \
# --dest-server https://kubernetes.default.svc \
# --helm-set-string dockerImage=$REGISTRY/pixelaw-core:${VERSION} \
# --upsert \
# --server $ARGOCD_SERVER \
# --auth-token $ARGOCD_AUTH_TOKEN
# argocd app sync $DEPLOY_NAME
# argocd app wait $DEPLOY_NAME
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN yarn build --mode production

FROM ghcr.io/pixelaw/keiko:0.1.10 AS runtime

ENV PUBLIC_TORII=http://localhost:8080
ENV PUBLIC_NODE_URL=http://localhost:5050
ENV VITE_PUBLIC_ETH_CONTRACT_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
ENV CORE_VERSION=VERSION
#ENV PUBLIC_TORII=http://localhost:8080
#ENV PUBLIC_NODE_URL=http://localhost:5050
#ENV VITE_PUBLIC_ETH_CONTRACT_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
#ENV CORE_VERSION=VERSION

HEALTHCHECK CMD (curl --fail http://localhost:3000 && curl --fail http://localhost:5050) || exit 1

Expand All @@ -57,7 +57,7 @@ WORKDIR /keiko

COPY --link ./startup.sh ./startup.sh
COPY --from=web_node_builder /app/dist static/
COPY --link ./web/.env.example .env.core.example
COPY --link ./web/.env .env.core


COPY ./bots ./bots
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REPO = ghcr.io/pixelaw/core
CORE_VERSION = 0.1.3
CORE_VERSION = 0.1.4
KEIKO_VERSION = v0.1.5


Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.3
0.1.4
2 changes: 1 addition & 1 deletion contracts/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
cairo-version = "2.4.0"
name = "pixelaw"
version = "0.1.3"
version = "0.1.4"
homepage = "https://github.com/pixelaw/core"

[cairo]
Expand Down
4 changes: 2 additions & 2 deletions contracts/scripts/create_genesis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
TARGET=${1:-"target/dev"}

export STARKNET_RPC="http://localhost:5050/"

export DOJO_PRIVATE_KEY=$(cat /run/secrets/privatekey)

GENESIS_TEMPLATE=genesis_template.json
GENESIS_OUT=genesis.json
Expand All @@ -39,7 +39,7 @@ katana \
sozo build

# Sozo migrate
sozo migrate
sozo migrate --

# Setup PixeLAW auth and init
declare "WORLD"=$(cat $MANIFEST | jq -r '.world.address')
Expand Down
2 changes: 1 addition & 1 deletion deployment/demo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: "0.0.45"
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.3"
appVersion: "0.1.4"
2 changes: 1 addition & 1 deletion deployment/test/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: "0.0.45"
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.3"
appVersion: "0.1.4"
1 change: 1 addition & 0 deletions web/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ VITE_PUBLIC_ETH_CONTRACT_ADDRESS=0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54
PUBLIC_NODE_URL=http://localhost:5050
PUBLIC_TORII=http://localhost:8080
CORE_VERSION=VERSION_PLACEHOLDER
PUBLIC_EXAMPLE=caspar
2 changes: 1 addition & 1 deletion web/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default defineConfig({
wasm(),
topLevelAwait(),
ImportMetaEnvPlugin.vite({
example: ".env.example",
example: ".env",
}),
],
server: {
Expand Down

0 comments on commit 1b1e6de

Please sign in to comment.