diff --git a/.github/workflows/release-develop.yaml b/.github/workflows/release-develop.yaml index c861d31..12d1505 100644 --- a/.github/workflows/release-develop.yaml +++ b/.github/workflows/release-develop.yaml @@ -4,6 +4,9 @@ on: workflows: ["Verify new Code"] types: - completed + push: + branches: + - feature/ci-builds jobs: download-lib: @@ -24,7 +27,8 @@ jobs: with: image-name: ${{ github.repository }} build-platforms: 'linux/amd64' - artifact-name: lib + artifact-name: '*' + push-to: dockerhub secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/verify-new-code.yml b/.github/workflows/verify-new-code.yml index 8d029df..9c90b32 100644 --- a/.github/workflows/verify-new-code.yml +++ b/.github/workflows/verify-new-code.yml @@ -28,14 +28,14 @@ jobs: run: npm run lint:check-commits - run: npm run lint:check - test: - needs: [verify-code] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: 'npm' - - run: npm ci - - run: npm run test:headless + # test: + # needs: [verify-code] + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-node@v3 + # with: + # node-version: 16 + # cache: 'npm' + # - run: npm ci + # - run: npm run test:headless diff --git a/Dockerfile b/Dockerfile index bcefc03..bfb538b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,13 @@ ARG PRODUCTION=false RUN sh -c '[ -z "$http_proxy" ] || ( npm config set proxy $http_proxy; npm config set https-proxy $http_proxy )' # First build the lib WORKDIR /usr/src/lib -RUN ls ./artifacts/lib/ -COPY package.json package-lock.json ./artifacts/lib/ +RUN ls artifacts +COPY package.json package-lock.json artifacts/lib/ RUN npm install -COPY ./angular.json ./tsconfig.json ./tsconfig.app.json ./tsconfig.spec.json ./artifacts/lib/ -COPY ./src ./artifacts/lib/src -RUN cd lib && npm run build @samply/lens-core && npm run build @samply/lens-components -RUN cd lib/dist/samply/lens-core && npm link \ +COPY ./angular.json ./tsconfig.json ./tsconfig.app.json ./tsconfig.spec.json artifacts/lib/ +COPY ./src artifacts/lib/src +RUN npm run build @samply/lens-core && npm run build @samply/lens-components +RUN cd dist/samply/lens-core && npm link \ && cd ../lens-components && npm link # Second build the application WORKDIR /usr/src/app