Skip to content

Commit

Permalink
fix: versioning (#34)
Browse files Browse the repository at this point in the history
* fix(docker): copy hidden folders in source tree

* fix(docker): ignore files

* fix(cd): factor out version bump
  • Loading branch information
thenoursehorse committed Oct 27, 2023
1 parent 7dc56b7 commit f621639
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
20 changes: 13 additions & 7 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
.travis.yml
Dockerfile
Jenkinsfile
.git/objects/pack
build*
_build*

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
*egg-info

# From nox build
build
_build
.nox

# docker files
docker/
docker-compose*
Dockerfile*

# git files
.git/objects/pack
18 changes: 15 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ on:

jobs:

build:
runs-on: ubuntu-22.04
bump-version:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: write

steps:
- uses: actions/checkout@v4

with:
fetch-depth: 0

- name: Bump version and push tag
id: tag_version
uses: mathieudutour/[email protected]
Expand All @@ -29,6 +32,15 @@ jobs:
name: Release ${{ steps.tag_version.outputs.new_tag }}
body: ${{ steps.tag_version.outputs.changelog }}

build:
needs: [bump-version]
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Python 3.10 and TRIQS
uses: ./.github/actions/setup-triqs
with:
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
__pycache__/
*.py[cod]
*$py.class

*egg-info

# From nox
# From nox build
build
_build
.nox

# From pytest
# pytest
.pytest_cache

# Potential auth keys
.github.auth

# Visual Studio Code
.vscode
6 changes: 3 additions & 3 deletions docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ FROM build_arm64

# Install any other software we need
RUN pip install --upgrade pip \
&& pip install nox matplotlib
#mypy
&& pip install matplotlib
# nox mypy

# Install library
WORKDIR $BUILD/$APPNAME
COPY . $SRC/$APPNAME
RUN cp -as $SRC/$APPNAME/* .
RUN cp -asT $SRC/$APPNAME/ .
RUN pip install -e .[test,docs]

# Build documentation
Expand Down

0 comments on commit f621639

Please sign in to comment.